diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-11-23 10:55:50 +1300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 01:36:32 +0000 |
| commit | a5c52ff0bb57fccc2dcd3bd10647d2fa77ddf8c3 (patch) | |
| tree | e085aadbd071233b82de4a8c76d269f9d746daaa | |
| parent | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (diff) | |
| download | talos-openbmc-a5c52ff0bb57fccc2dcd3bd10647d2fa77ddf8c3.tar.gz talos-openbmc-a5c52ff0bb57fccc2dcd3bd10647d2fa77ddf8c3.zip | |
poky: thud refresh 87e3a9739d..1cab405d88
Update poky to thud HEAD.
Adrian Bunk (1):
archiver.bbclass: Fix COPYLEFT_LICENSE_{IN, EX}CLUDE
Adrian Freihofer (2):
systemd: fix PN-container package splitting
devtool: fix target-deploy --strip
Alejandro Enedino Hernandez Samaniego (1):
python: Adds instructions to the manifest file
Alexander Kanavin (3):
meson: do not manipulate the environment when looking for python via pkg-config
openssl: update to 1.1.1a
libc-package: fix postinst error when ENABLE_BINARY_LOCALE_GENERATION = "0"
Alexey Brodkin (1):
gdb: Remove long ago upstreamed patch
André Draszik (1):
linux-firmware: better packaging for TI wl12xx & wl18xx firmwares
Anuj Mittal (13):
maintainers.inc: update Intel owners
gst-plugins-bad: add PACKAGECONFIG for msdk
gstreamer1.0: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-plugins-base: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-plugins-good: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-plugins-bad: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-plugins-ugly: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-libav: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-vaapi: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-rtsp-server: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-omx: upgrade 1.14.3 -> 1.14.4
gstreamer1.0-python: upgrade 1.14.3 -> 1.14.4
gst-validate: upgrade 1.14.2 -> 1.14.4
Armin Kuster (1):
gnutls: update to 3.6.4
Bruce Ashfield (13):
linux-yocto: remove obselete options from lxc config
linux-yocto/4.14: configuration cleanups
linux-yocto/4.18: -rt sync and config cleanups
linux-yocto/tiny: switch default branch to standard/tiny/base
linux-yocto/tiny: restore qemuarm support
linux-yocto/4.18: bug fixes and configuration tweaks
linux-yocto/4.18: update to v4.18.17
linux-yocto/4.14: update to v4.14.79
linux-yocto/4.18: integrate CVE fixes
linux-yocto/4.18: update to v4.18.20
linux-yocto/4.18: update to v4.18.21
linux-yocto: configuration updates (virtio and tpm)
linux-yocto: correct qemumips64el definition
Carlos Rafael Giani (10):
gstreamer1.0: upgrade to version 1.14.3
gstreamer1.0-plugin-base: upgrade to version 1.14.3
gstreamer1.0-plugin-good: upgrade to version 1.14.3
gstreamer1.0-plugin-bad: upgrade to version 1.14.3
gstreamer1.0-plugin-ugly: upgrade to version 1.14.3
gstreamer1.0-libav: upgrade to version 1.14.3
gstreamer1.0-rtsp-server: upgrade to version 1.14.3
gstreamer1.0-vaapi: upgrade to version 1.14.3
gstreamer1.0-omx: upgrade to version 1.14.3
gstreamer1.0-python: upgrade to version 1.14.3
Changhyeok Bae (2):
iproute2: 4.18.0 -> 4.19.0
ethtool: 4.17 -> 4.19
Christophe PRIOUZEAU (1):
openssl: correct bad path on package preprocess
Douglas Royds (4):
boost-context: Reproducibility: Set .file section for all *_elf_gas.S files
reproducible: Refactor: Break out fixed_source_date_epoch() function
reproducible: Don't look for youngest file when no source tarball
ptest: Reproducibility: Take control of umask
Eric Chanudet (1):
licence: Add license file CC-BY-SA-4.0
Hongxu Jia (6):
elfutils: 0.174 -> 0.175
gnupg: upgrade 2.2.9 -> 2.2.10
gnupg: upgrade 2.2.10 -> 2.2.11
libgcrypt: upgrade 1.8.3 -> 1.8.4
ghostscript: 9.25 -> 9.26
go 1.9/1.11: fix textrel qa warning for non mips arch
Joshua Watt (3):
meta/icecc.bbclass: Move system blacklist to variables
meta/icecc.bbclass: Update system blacklists
classes/icecc.bbclass: Fix ccache disable
Kai Kang (1):
multilib_script: fix packages split
Khem Raj (3):
valgrind: Skip vgpreload_memcheck shared object from stripping
populate_sdk_ext.bbclass: Include site.conf in parsing for contents for local.conf
local.conf.sample: Update the sample config as per new migration manual
Ming Liu (1):
image.bbclass: fix a wrong position blank
Mingli Yu (2):
mdadm: improve the run-ptest
nspr: improve reproducibility
Niko Mauno (1):
opkg-utils: Fix update-alternatives link relocation
Otavio Salvador (1):
linux-firmware: Bump revision to 1baa348
Paul Eggleton (1):
socat: fix LICENSE
Peter Kjellerstedt (3):
meson: Correct use of the _append operator
bitbake: bitbake-diffsigs: Merge with bitbake-dumpsig
bitbake: bitbake-diffsigs: Support recursive deps with signature files
Richard Purdie (9):
meson: Disable rpath stripping at install time
scripts/runqemu: Fix logic error causing failures with MACHINE from the environment
meta-selftest/error: Cleanup large trailing whitespace
bitbake: server/process: Make lockfile handling clearer
bitbake: server/process: Show the last 60 log lines, not the last 10
bitbake: server/process: Show last 60 lines of the log if the server didn't start
poky.conf: Update the distros we test against on the autobuilder
poky: Update version to 2.6.1
build-appliance-image: Update to thud head revision
Robert Yang (5):
classes: Remove tab indentations in python code
recipes: Remove tab indentations in python code
bugzilla.bbclass: Remove it since obsoleted
sstate.bbclass: Only remove sstate file when task is existed
bitbake: server/process: print a message when no logfile
Ross Burton (12):
cpio: fix crash when appending to archives
image_types: use cpio-native to build cpio images
libtasn1: no need to inherit binconfig
binconfig: only try to mangles files
piglit: add missing waffle-bin dependency
ruby: upgrade 2.5.1 -> 2.5.3
insane: Clarify GNU_HASH warning
patchreview: Various fixes/improvements
python3: don't cripple target distutils
python3: drop redundant patch
bitbake: layerindex: don't use shell=True when cloning
bitbake: fetch: don't use shell=True when listing ar files
Zheng Ruoqin (2):
nss: Fix SHA_HTONL bug for arm 32be.
createrepo-c: Fix setup of logging (log domains)
Change-Id: I025dd27f44e57af38abff110ebc331e371bc461b
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
133 files changed, 2260 insertions, 3037 deletions
diff --git a/poky/bitbake/bin/bitbake-diffsigs b/poky/bitbake/bin/bitbake-diffsigs index 4e6bbddcd..fa430bb3b 100755 --- a/poky/bitbake/bin/bitbake-diffsigs +++ b/poky/bitbake/bin/bitbake-diffsigs @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# bitbake-diffsigs -# BitBake task signature data comparison utility +# bitbake-diffsigs / bitbake-dumpsig +# BitBake task signature data dump and comparison utility # # Copyright (C) 2012-2013, 2017 Intel Corporation # @@ -21,7 +21,6 @@ import os import sys import warnings -import fnmatch import argparse import logging import pickle @@ -32,7 +31,10 @@ import bb.tinfoil import bb.siggen import bb.msg -logger = bb.msg.logger_create('bitbake-diffsigs') +myname = os.path.basename(sys.argv[0]) +logger = bb.msg.logger_create(myname) + +is_dump = myname == 'bitbake-dumpsig' def find_siginfo(tinfoil, pn, taskname, sigs=None): result = None @@ -59,8 +61,8 @@ def find_siginfo(tinfoil, pn, taskname, sigs=None): sys.exit(2) return result -def find_compare_task(bbhandler, pn, taskname, sig1=None, sig2=None, color=False): - """ Find the most recent signature files for the specified PN/task and compare them """ +def find_siginfo_task(bbhandler, pn, taskname, sig1=None, sig2=None): + """ Find the most recent signature files for the specified PN/task """ if not taskname.startswith('do_'): taskname = 'do_%s' % taskname @@ -79,73 +81,81 @@ def find_compare_task(bbhandler, pn, taskname, sig1=None, sig2=None, color=False latestfiles = [sigfiles[sig1], sigfiles[sig2]] else: filedates = find_siginfo(bbhandler, pn, taskname) - latestfiles = sorted(filedates.keys(), key=lambda f: filedates[f])[-3:] + latestfiles = sorted(filedates.keys(), key=lambda f: filedates[f])[-2:] if not latestfiles: logger.error('No sigdata files found matching %s %s' % (pn, taskname)) sys.exit(1) - elif len(latestfiles) < 2: - logger.error('Only one matching sigdata file found for the specified task (%s %s)' % (pn, taskname)) - sys.exit(1) - # Define recursion callback - def recursecb(key, hash1, hash2): - hashes = [hash1, hash2] - hashfiles = find_siginfo(bbhandler, key, None, hashes) - - recout = [] - if len(hashfiles) == 0: - recout.append("Unable to find matching sigdata for %s with hashes %s or %s" % (key, hash1, hash2)) - elif not hash1 in hashfiles: - recout.append("Unable to find matching sigdata for %s with hash %s" % (key, hash1)) - elif not hash2 in hashfiles: - recout.append("Unable to find matching sigdata for %s with hash %s" % (key, hash2)) - else: - out2 = bb.siggen.compare_sigfiles(hashfiles[hash1], hashfiles[hash2], recursecb, color=color) - for change in out2: - for line in change.splitlines(): - recout.append(' ' + line) + return latestfiles - return recout - # Recurse into signature comparison - logger.debug("Signature file (previous): %s" % latestfiles[-2]) - logger.debug("Signature file (latest): %s" % latestfiles[-1]) - output = bb.siggen.compare_sigfiles(latestfiles[-2], latestfiles[-1], recursecb, color=color) - if output: - print('\n'.join(output)) - sys.exit(0) +# Define recursion callback +def recursecb(key, hash1, hash2): + hashes = [hash1, hash2] + hashfiles = find_siginfo(tinfoil, key, None, hashes) + + recout = [] + if len(hashfiles) == 0: + recout.append("Unable to find matching sigdata for %s with hashes %s or %s" % (key, hash1, hash2)) + elif not hash1 in hashfiles: + recout.append("Unable to find matching sigdata for %s with hash %s" % (key, hash1)) + elif not hash2 in hashfiles: + recout.append("Unable to find matching sigdata for %s with hash %s" % (key, hash2)) + else: + out2 = bb.siggen.compare_sigfiles(hashfiles[hash1], hashfiles[hash2], recursecb, color=color) + for change in out2: + for line in change.splitlines(): + recout.append(' ' + line) + return recout parser = argparse.ArgumentParser( - description="Compares siginfo/sigdata files written out by BitBake") + description=("Dumps" if is_dump else "Compares") + " siginfo/sigdata files written out by BitBake") -parser.add_argument('-d', '--debug', +parser.add_argument('-D', '--debug', help='Enable debug output', action='store_true') -parser.add_argument('--color', - help='Colorize output (where %(metavar)s is %(choices)s)', - choices=['auto', 'always', 'never'], default='auto', metavar='color') +if is_dump: + parser.add_argument("-t", "--task", + help="find the signature data file for the last run of the specified task", + action="store", dest="taskargs", nargs=2, metavar=('recipename', 'taskname')) -parser.add_argument("-t", "--task", - help="find the signature data files for last two runs of the specified task and compare them", - action="store", dest="taskargs", nargs=2, metavar=('recipename', 'taskname')) + parser.add_argument("sigdatafile1", + help="Signature file to dump. Not used when using -t/--task.", + action="store", nargs='?', metavar="sigdatafile") +else: + parser.add_argument('-c', '--color', + help='Colorize the output (where %(metavar)s is %(choices)s)', + choices=['auto', 'always', 'never'], default='auto', metavar='color') + + parser.add_argument('-d', '--dump', + help='Dump the last signature data instead of comparing (equivalent to using bitbake-dumpsig)', + action='store_true') -parser.add_argument("-s", "--signature", - help="With -t/--task, specify the signatures to look for instead of taking the last two", - action="store", dest="sigargs", nargs=2, metavar=('fromsig', 'tosig')) + parser.add_argument("-t", "--task", + help="find the signature data files for the last two runs of the specified task and compare them", + action="store", dest="taskargs", nargs=2, metavar=('recipename', 'taskname')) -parser.add_argument("sigdatafile1", - help="First signature file to compare (or signature file to dump, if second not specified). Not used when using -t/--task.", - action="store", nargs='?') + parser.add_argument("-s", "--signature", + help="With -t/--task, specify the signatures to look for instead of taking the last two", + action="store", dest="sigargs", nargs=2, metavar=('fromsig', 'tosig')) -parser.add_argument("sigdatafile2", - help="Second signature file to compare", - action="store", nargs='?') + parser.add_argument("sigdatafile1", + help="First signature file to compare (or signature file to dump, if second not specified). Not used when using -t/--task.", + action="store", nargs='?') + parser.add_argument("sigdatafile2", + help="Second signature file to compare", + action="store", nargs='?') options = parser.parse_args() +if is_dump: + options.color = 'never' + options.dump = True + options.sigdatafile2 = None + options.sigargs = None if options.debug: logger.setLevel(logging.DEBUG) @@ -155,17 +165,32 @@ color = (options.color == 'always' or (options.color == 'auto' and sys.stdout.is if options.taskargs: with bb.tinfoil.Tinfoil() as tinfoil: tinfoil.prepare(config_only=True) - if options.sigargs: - find_compare_task(tinfoil, options.taskargs[0], options.taskargs[1], options.sigargs[0], options.sigargs[1], color=color) + if not options.dump and options.sigargs: + files = find_siginfo_task(tinfoil, options.taskargs[0], options.taskargs[1], options.sigargs[0], options.sigargs[1]) + else: + files = find_siginfo_task(tinfoil, options.taskargs[0], options.taskargs[1]) + + if options.dump: + logger.debug("Signature file: %s" % files[-1]) + output = bb.siggen.dump_sigfile(files[-1]) else: - find_compare_task(tinfoil, options.taskargs[0], options.taskargs[1], color=color) + if len(files) < 2: + logger.error('Only one matching sigdata file found for the specified task (%s %s)' % (options.taskargs[0], options.taskargs[1])) + sys.exit(1) + + # Recurse into signature comparison + logger.debug("Signature file (previous): %s" % files[-2]) + logger.debug("Signature file (latest): %s" % files[-1]) + output = bb.siggen.compare_sigfiles(files[-2], files[-1], recursecb, color=color) else: if options.sigargs: logger.error('-s/--signature can only be used together with -t/--task') sys.exit(1) try: - if options.sigdatafile1 and options.sigdatafile2: - output = bb.siggen.compare_sigfiles(options.sigdatafile1, options.sigdatafile2, color=color) + if not options.dump and options.sigdatafile1 and options.sigdatafile2: + with bb.tinfoil.Tinfoil() as tinfoil: + tinfoil.prepare(config_only=True) + output = bb.siggen.compare_sigfiles(options.sigdatafile1, options.sigdatafile2, recursecb, color=color) elif options.sigdatafile1: output = bb.siggen.dump_sigfile(options.sigdatafile1) else: @@ -179,5 +204,5 @@ else: logger.error('Invalid signature data - ensure you are specifying sigdata/siginfo files') sys.exit(1) - if output: - print('\n'.join(output)) +if output: + print('\n'.join(output)) diff --git a/poky/bitbake/bin/bitbake-dumpsig b/poky/bitbake/bin/bitbake-dumpsig index 95ebd9354..b1e8489b4 100755..120000 --- a/poky/bitbake/bin/bitbake-dumpsig +++ b/poky/bitbake/bin/bitbake-dumpsig @@ -1,94 +1 @@ -#!/usr/bin/env python3 - -# bitbake-dumpsig -# BitBake task signature dump utility -# -# Copyright (C) 2013 Intel Corporation -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -import os -import sys -import warnings -import optparse -import logging -import pickle - -sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib')) - -import bb.tinfoil -import bb.siggen -import bb.msg - -logger = bb.msg.logger_create('bitbake-dumpsig') - -def find_siginfo_task(bbhandler, pn, taskname): - """ Find the most recent signature file for the specified PN/task """ - - if not hasattr(bb.siggen, 'find_siginfo'): - logger.error('Metadata does not support finding signature data files') - sys.exit(1) - - if not taskname.startswith('do_'): - taskname = 'do_%s' % taskname - - filedates = bb.siggen.find_siginfo(pn, taskname, None, bbhandler.config_data) - latestfiles = sorted(filedates.keys(), key=lambda f: filedates[f])[-1:] - if not latestfiles: - logger.error('No sigdata files found matching %s %s' % (pn, taskname)) - sys.exit(1) - - return latestfiles[0] - -parser = optparse.OptionParser( - description = "Dumps siginfo/sigdata files written out by BitBake", - usage = """ - %prog -t recipename taskname - %prog sigdatafile""") - -parser.add_option("-D", "--debug", - help = "enable debug", - action = "store_true", dest="debug", default = False) - -parser.add_option("-t", "--task", - help = "find the signature data file for the specified task", - action="store", dest="taskargs", nargs=2, metavar='recipename taskname') - -options, args = parser.parse_args(sys.argv) - -if options.debug: - logger.setLevel(logging.DEBUG) - -if options.taskargs: - tinfoil = bb.tinfoil.Tinfoil() - tinfoil.prepare(config_only = True) - file = find_siginfo_task(tinfoil, options.taskargs[0], options.taskargs[1]) - logger.debug("Signature file: %s" % file) -elif len(args) == 1: - parser.print_help() - sys.exit(0) -else: - file = args[1] - -try: - output = bb.siggen.dump_sigfile(file) -except IOError as e: - logger.error(str(e)) - sys.exit(1) -except (pickle.UnpicklingError, EOFError): - logger.error('Invalid signature data - ensure you are specifying a sigdata/siginfo file') - sys.exit(1) - -if output: - print('\n'.join(output)) +bitbake-diffsigs
\ No newline at end of file diff --git a/poky/bitbake/lib/bb/fetch2/__init__.py b/poky/bitbake/lib/bb/fetch2/__init__.py index 3b8389e0a..709372e16 100644 --- a/poky/bitbake/lib/bb/fetch2/__init__.py +++ b/poky/bitbake/lib/bb/fetch2/__init__.py @@ -1469,7 +1469,7 @@ class FetchMethod(object): else: cmd = 'rpm2cpio.sh %s | cpio -id' % (file) elif file.endswith('.deb') or file.endswith('.ipk'): - output = subprocess.check_output('ar -t %s' % file, preexec_fn=subprocess_setup, shell=True) + output = subprocess.check_output(['ar', '-t', file], preexec_fn=subprocess_setup) datafile = None if output: for line in output.decode().splitlines(): diff --git a/poky/bitbake/lib/bb/server/process.py b/poky/bitbake/lib/bb/server/process.py index 42d79079a..070da4fe7 100644 --- a/poky/bitbake/lib/bb/server/process.py +++ b/poky/bitbake/lib/bb/server/process.py @@ -239,6 +239,12 @@ class ProcessServer(multiprocessing.Process): while not lock: with bb.utils.timeout(3): lock = bb.utils.lockfile(lockfile, shared=False, retry=False, block=True) + if lock: + # We hold the lock so we can remove the file (hide stale pid data) + bb.utils.remove(lockfile) + bb.utils.unlockfile(lock) + return + if not lock: # Some systems may not have lsof available procs = None @@ -259,10 +265,6 @@ class ProcessServer(multiprocessing.Process): if procs: msg += ":\n%s" % str(procs) print(msg) - return - # We hold the lock so we can remove the file (hide stale pid data) - bb.utils.remove(lockfile) - bb.utils.unlockfile(lock) def idle_commands(self, delay, fds=None): nextsleep = delay @@ -412,23 +414,33 @@ class BitBakeServer(object): logstart_re = re.compile(self.start_log_format % ('([0-9]+)', '([0-9-]+ [0-9:.]+)')) started = False lines = [] + lastlines = [] with open(logfile, "r") as f: for line in f: if started: lines.append(line) else: + lastlines.append(line) res = logstart_re.match(line.rstrip()) if res: ldatetime = datetime.datetime.strptime(res.group(2), self.start_log_datetime_format) if ldatetime >= startdatetime: started = True lines.append(line) + if len(lastlines) > 60: + lastlines = lastlines[-60:] if lines: - if len(lines) > 10: - bb.error("Last 10 lines of server log for this session (%s):\n%s" % (logfile, "".join(lines[-10:]))) + if len(lines) > 60: + bb.error("Last 60 lines of server log for this session (%s):\n%s" % (logfile, "".join(lines[-60:]))) else: bb.error("Server log for this session (%s):\n%s" % (logfile, "".join(lines))) + elif lastlines: + bb.error("Server didn't start, last 60 loglines (%s):\n%s" % (logfile, "".join(lastlines))) + else: + bb.error("%s doesn't exist" % logfile) + raise SystemExit(1) + ready.close() def _startServer(self): diff --git a/poky/bitbake/lib/bblayers/layerindex.py b/poky/bitbake/lib/bblayers/layerindex.py index 9f02a9da2..b2ff2268e 100644 --- a/poky/bitbake/lib/bblayers/layerindex.py +++ b/poky/bitbake/lib/bblayers/layerindex.py @@ -28,7 +28,7 @@ class LayerIndexPlugin(ActionPlugin): layerdir = os.path.join(repodir, subdir) if not os.path.exists(repodir): if fetch_layer: - result = subprocess.call('git clone %s %s' % (url, repodir), shell = True) + result = subprocess.call(['git', 'clone', url, repodir]) if result: logger.error("Failed to download %s" % url) return None, None, None diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index 7e6fe1308..70f90d32e 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -1,6 +1,6 @@ DISTRO = "poky" DISTRO_NAME = "Poky (Yocto Project Reference Distro)" -DISTRO_VERSION = "2.6" +DISTRO_VERSION = "2.6.1" DISTRO_CODENAME = "thud" SDK_VENDOR = "-pokysdk" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" @@ -67,14 +67,12 @@ SANITY_TESTED_DISTROS ?= " \ poky-2.5 \n \ poky-2.6 \n \ ubuntu-16.04 \n \ - ubuntu-16.10 \n \ - ubuntu-17.04 \n \ - fedora-26 \n \ + ubuntu-18.04 \n \ + fedora-28 \n \ centos-7 \n \ debian-8 \n \ debian-9 \n \ - opensuse-42.1 \n \ - opensuse-42.2 \n \ + opensuse-42.3 \n \ " # # OELAYOUT_ABI allows us to notify users when the format of TMPDIR changes in diff --git a/poky/meta-poky/conf/local.conf.sample b/poky/meta-poky/conf/local.conf.sample index d28bf58a1..cf9659881 100644 --- a/poky/meta-poky/conf/local.conf.sample +++ b/poky/meta-poky/conf/local.conf.sample @@ -157,10 +157,12 @@ USER_CLASSES ?= "buildstats image-mklibs image-prelink" # Runtime testing of images # # The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. To -# enable this uncomment this line. See classes/testimage(-auto).bbclass for -# further details. -#TEST_IMAGE = "1" +# after any root filesystems are created and run tests against those images. It can also +# run tests against any SDK that are built. To enable this uncomment these lines. +# See classes/test{image,sdk}.bbclass for further details. +#IMAGE_CLASSES += "testimage testsdk" +#TESTIMAGE_AUTO_qemuall = "1" + # # Interactive shell configuration # diff --git a/poky/meta-selftest/recipes-test/error/error.bb b/poky/meta-selftest/recipes-test/error/error.bb index 3c22e7cbe..65d00a46d 100644 --- a/poky/meta-selftest/recipes-test/error/error.bb +++ b/poky/meta-selftest/recipes-test/error/error.bb @@ -2,7 +2,7 @@ SUMMARY = "Error Test case that fails on do_compile" DESCRIPTION = "This generates a compile time error to be used to for testing." LICENSE = "MIT" -INHIBIT_DEFAULT_DEPS = "1" +INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" do_compile() { diff --git a/poky/meta/classes/archiver.bbclass b/poky/meta/classes/archiver.bbclass index 0a9fe4fd1..e321a0e36 100644 --- a/poky/meta/classes/archiver.bbclass +++ b/poky/meta/classes/archiver.bbclass @@ -23,9 +23,6 @@ # COPYLEFT_RECIPE_TYPES = 'target' # -# Don't filter the license by default -COPYLEFT_LICENSE_INCLUDE ?= '' -COPYLEFT_LICENSE_EXCLUDE ?= '' # Create archive for all the recipe types COPYLEFT_RECIPE_TYPES ?= 'target native nativesdk cross crosssdk cross-canadian' inherit copyleft_filter diff --git a/poky/meta/classes/binconfig.bbclass b/poky/meta/classes/binconfig.bbclass index 39c3e2b17..133b9537c 100644 --- a/poky/meta/classes/binconfig.bbclass +++ b/poky/meta/classes/binconfig.bbclass @@ -31,7 +31,7 @@ BINCONFIG_GLOB ?= "*-config" PACKAGE_PREPROCESS_FUNCS += "binconfig_package_preprocess" binconfig_package_preprocess () { - for config in `find ${PKGD} -name '${BINCONFIG_GLOB}'`; do + for config in `find ${PKGD} -type f -name '${BINCONFIG_GLOB}'`; do sed -i \ -e 's:${STAGING_BASELIBDIR}:${base_libdir}:g;' \ -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ @@ -40,7 +40,7 @@ binconfig_package_preprocess () { -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \ $config done - for lafile in `find ${PKGD} -name "*.la"` ; do + for lafile in `find ${PKGD} -type f -name "*.la"` ; do sed -i \ -e 's:${STAGING_BASELIBDIR}:${base_libdir}:g;' \ -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ @@ -54,7 +54,7 @@ binconfig_package_preprocess () { SYSROOT_PREPROCESS_FUNCS += "binconfig_sysroot_preprocess" binconfig_sysroot_preprocess () { - for config in `find ${S} -name '${BINCONFIG_GLOB}'` `find ${B} -name '${BINCONFIG_GLOB}'`; do + for config in `find ${S} -type f -name '${BINCONFIG_GLOB}'` `find ${B} -type f -name '${BINCONFIG_GLOB}'`; do configname=`basename $config` install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} sed ${@get_binconfig_mangle(d)} $config > ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname diff --git a/poky/meta/classes/bugzilla.bbclass b/poky/meta/classes/bugzilla.bbclass deleted file mode 100644 index 8909c2734..000000000 --- a/poky/meta/classes/bugzilla.bbclass +++ /dev/null @@ -1,187 +0,0 @@ -# -# Small event handler to automatically open URLs and file -# bug reports at a bugzilla of your choiche -# it uses XML-RPC interface, so you must have it enabled -# -# Before using you must define BUGZILLA_USER, BUGZILLA_PASS credentials, -# BUGZILLA_XMLRPC - uri of xmlrpc.cgi, -# BUGZILLA_PRODUCT, BUGZILLA_COMPONENT - a place in BTS for build bugs -# BUGZILLA_VERSION - version against which to report new bugs -# - -def bugzilla_find_bug_report(debug_file, server, args, bugname): - args['summary'] = bugname - bugs = server.Bug.search(args) - if len(bugs['bugs']) == 0: - print >> debug_file, "Bugs not found" - return (False,None) - else: # silently pick the first result - print >> debug_file, "Result of bug search is " - print >> debug_file, bugs - status = bugs['bugs'][0]['status'] - id = bugs['bugs'][0]['id'] - return (not status in ["CLOSED", "RESOLVED", "VERIFIED"],id) - -def bugzilla_file_bug(debug_file, server, args, name, text, version): - args['summary'] = name - args['comment'] = text - args['version'] = version - args['op_sys'] = 'Linux' - args['platform'] = 'Other' - args['severity'] = 'normal' - args['priority'] = 'Normal' - try: - return server.Bug.create(args)['id'] - except Exception, e: - print >> debug_file, repr(e) - return None - -def bugzilla_reopen_bug(debug_file, server, args, bug_number): - args['ids'] = [bug_number] - args['status'] = "CONFIRMED" - try: - server.Bug.update(args) - return True - except Exception, e: - print >> debug_file, repr(e) - return False - -def bugzilla_create_attachment(debug_file, server, args, bug_number, text, file_name, log, logdescription): - args['ids'] = [bug_number] - args['file_name'] = file_name - args['summary'] = logdescription - args['content_type'] = "text/plain" - args['data'] = log - args['comment'] = text - try: - server.Bug.add_attachment(args) - return True - except Exception, e: - print >> debug_file, repr(e) - return False - -def bugzilla_add_comment(debug_file, server, args, bug_number, text): - args['id'] = bug_number - args['comment'] = text - try: - server.Bug.add_comment(args) - return True - except Exception, e: - print >> debug_file, repr(e) - return False - -addhandler bugzilla_eventhandler -bugzilla_eventhandler[eventmask] = "bb.event.MsgNote bb.build.TaskFailed" -python bugzilla_eventhandler() { - import glob - import xmlrpclib, httplib - - class ProxiedTransport(xmlrpclib.Transport): - def __init__(self, proxy, use_datetime = 0): - xmlrpclib.Transport.__init__(self, use_datetime) - self.proxy = proxy - self.user = None - self.password = None - - def set_user(self, user): - self.user = user - - def set_password(self, password): - self.password = password - - def make_connection(self, host): - self.realhost = host - return httplib.HTTP(self.proxy) - - def send_request(self, connection, handler, request_body): - connection.putrequest("POST", 'http://%s%s' % (self.realhost, handler)) - if self.user != None: - if self.password != None: - auth = "%s:%s" % (self.user, self.password) - else: - auth = self.user - connection.putheader("Proxy-authorization", "Basic " + base64.encodestring(auth)) - - event = e - data = e.data - name = bb.event.getName(event) - if name == "MsgNote": - # avoid recursion - return - - if name == "TaskFailed": - xmlrpc = data.getVar("BUGZILLA_XMLRPC") - user = data.getVar("BUGZILLA_USER") - passw = data.getVar("BUGZILLA_PASS") - product = data.getVar("BUGZILLA_PRODUCT") - compon = data.getVar("BUGZILLA_COMPONENT") - version = data.getVar("BUGZILLA_VERSION") - - proxy = data.getVar('http_proxy') - if (proxy): - import urllib2 - s, u, p, hostport = urllib2._parse_proxy(proxy) - transport = ProxiedTransport(hostport) - else: - transport = None - - server = xmlrpclib.ServerProxy(xmlrpc, transport=transport, verbose=0) - args = { - 'Bugzilla_login': user, - 'Bugzilla_password': passw, - 'product': product, - 'component': compon} - - # evil hack to figure out what is going on - debug_file = open(os.path.join(data.getVar("TMPDIR"),"..","bugzilla-log"),"a") - - file = None - bugname = "%(package)s-%(pv)s-autobuild" % { "package" : data.getVar("PN"), - "pv" : data.getVar("PV"), - } - log_file = glob.glob("%s/log.%s.*" % (event.data.getVar('T'), event.task)) - text = "The %s step in %s failed at %s for machine %s" % (e.task, data.getVar("PN"), data.getVar('DATETIME'), data.getVar('MACHINE') ) - if len(log_file) != 0: - print >> debug_file, "Adding log file %s" % log_file[0] - file = open(log_file[0], 'r') - log = file.read() - file.close(); - else: - print >> debug_file, "No log file found for the glob" - log = None - - (bug_open, bug_number) = bugzilla_find_bug_report(debug_file, server, args.copy(), bugname) - print >> debug_file, "Bug is open: %s and bug number: %s" % (bug_open, bug_number) - - # The bug is present and still open, attach an error log - if not bug_number: - bug_number = bugzilla_file_bug(debug_file, server, args.copy(), bugname, text, version) - if not bug_number: - print >> debug_file, "Couldn't acquire a new bug_numer, filing a bugreport failed" - else: - print >> debug_file, "The new bug_number: '%s'" % bug_number - elif not bug_open: - if not bugzilla_reopen_bug(debug_file, server, args.copy(), bug_number): - print >> debug_file, "Failed to reopen the bug #%s" % bug_number - else: - print >> debug_file, "Reopened the bug #%s" % bug_number - - if bug_number and log: - print >> debug_file, "The bug is known as '%s'" % bug_number - desc = "Build log for machine %s" % (data.getVar('MACHINE')) - if not bugzilla_create_attachment(debug_file, server, args.copy(), bug_number, text, log_file[0], log, desc): - print >> debug_file, "Failed to attach the build log for bug #%s" % bug_number - else: - print >> debug_file, "Created an attachment for '%s' '%s' '%s'" % (product, compon, bug_number) - else: - print >> debug_file, "Not trying to create an attachment for bug #%s" % bug_number - if not bugzilla_add_comment(debug_file, server, args.copy(), bug_number, text, ): - print >> debug_file, "Failed to create a comment the build log for bug #%s" % bug_number - else: - print >> debug_file, "Created an attachment for '%s' '%s' '%s'" % (product, compon, bug_number) - - # store bug number for oestats-client - if bug_number: - data.setVar('OESTATS_BUG_NUMBER', bug_number) -} - diff --git a/poky/meta/classes/crosssdk.bbclass b/poky/meta/classes/crosssdk.bbclass index 03b0c602c..fdaaac848 100644 --- a/poky/meta/classes/crosssdk.bbclass +++ b/poky/meta/classes/crosssdk.bbclass @@ -4,8 +4,8 @@ CLASSOVERRIDE = "class-crosssdk" MACHINEOVERRIDES = "" PACKAGE_ARCH = "${SDK_ARCH}" python () { - # set TUNE_PKGARCH to SDK_ARCH - d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH')) + # set TUNE_PKGARCH to SDK_ARCH + d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH')) } STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" diff --git a/poky/meta/classes/icecc.bbclass b/poky/meta/classes/icecc.bbclass index b5a845774..2b189232c 100644 --- a/poky/meta/classes/icecc.bbclass +++ b/poky/meta/classes/icecc.bbclass @@ -33,7 +33,7 @@ BB_HASHBASE_WHITELIST += "ICECC_PARALLEL_MAKE ICECC_DISABLED ICECC_USER_PACKAGE_ ICECC_CARET_WORKAROUND ICECC_CFLAGS ICECC_ENV_VERSION \ ICECC_DEBUG ICECC_LOGFILE ICECC_REPEAT_RATE ICECC_PREFERRED_HOST \ ICECC_CLANG_REMOTE_CPP ICECC_IGNORE_UNVERIFIED ICECC_TEST_SOCKET \ - ICECC_ENV_DEBUG \ + ICECC_ENV_DEBUG ICECC_SYSTEM_PACKAGE_BL ICECC_SYSTEM_CLASS_BL \ " ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env" @@ -61,6 +61,31 @@ CXXFLAGS += "${ICECC_CFLAGS}" # Debug flags when generating environments ICECC_ENV_DEBUG ??= "" +# "system" recipe blacklist contains a list of packages that can not distribute +# compile tasks for one reason or the other. When adding new entry, please +# document why (how it failed) so that we can re-evaluate it later e.g. when +# there is new version +# +# libgcc-initial - fails with CPP sanity check error if host sysroot contains +# cross gcc built for another target tune/variant +# target-sdk-provides-dummy - ${HOST_PREFIX} is empty which triggers the "NULL +# prefix" error. +ICECC_SYSTEM_PACKAGE_BL += "\ + libgcc-initial \ + target-sdk-provides-dummy \ + " + +# "system" classes that should be blacklisted. When adding new entry, please +# document why (how it failed) so that we can re-evaluate it later +# +# image - Image aren't compiling, but the testing framework for images captures +# PARALLEL_MAKE as part of the test environment. Many tests won't use +# icecream, but leaving the high level of parallelism can cause them to +# consume an unnecessary amount of resources. +ICECC_SYSTEM_CLASS_BL += "\ + image \ + " + def icecc_dep_prepend(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 @@ -134,7 +159,7 @@ def use_icecc(bb,d): pn = d.getVar('PN') - system_class_blacklist = [] + system_class_blacklist = (d.getVar('ICECC_SYSTEM_CLASS_BL') or "").split() user_class_blacklist = (d.getVar('ICECC_USER_CLASS_BL') or "none").split() package_class_blacklist = system_class_blacklist + user_class_blacklist @@ -143,15 +168,7 @@ def use_icecc(bb,d): bb.debug(1, "%s: class %s found in blacklist, disable icecc" % (pn, black)) return "no" - # "system" recipe blacklist contains a list of packages that can not distribute compile tasks - # for one reason or the other - # this is the old list (which doesn't seem to be valid anymore, because I was able to build - # all these with icecc enabled) - # system_package_blacklist = [ "glibc", "gcc", "bind", "u-boot", "dhcp-forwarder", "enchant", "connman", "orbit2" ] - # when adding new entry, please document why (how it failed) so that we can re-evaluate it later - # e.g. when there is new version - # building libgcc-initial with icecc fails with CPP sanity check error if host sysroot contains cross gcc built for another target tune/variant - system_package_blacklist = ["libgcc-initial"] + system_package_blacklist = (d.getVar('ICECC_SYSTEM_PACKAGE_BL') or "").split() user_package_blacklist = (d.getVar('ICECC_USER_PACKAGE_BL') or "").split() user_package_whitelist = (d.getVar('ICECC_USER_PACKAGE_WL') or "").split() package_blacklist = system_package_blacklist + user_package_blacklist @@ -381,7 +398,7 @@ set_icecc_env() { # Don't let ccache find the icecream compiler links that have been created, otherwise # it can end up invoking icecream recursively. export CCACHE_PATH="$PATH" - export CCACHE_DISBALE="1" + export CCACHE_DISABLE="1" export ICECC_VERSION ICECC_CC ICECC_CXX export PATH="$ICE_PATH:$PATH" diff --git a/poky/meta/classes/image.bbclass b/poky/meta/classes/image.bbclass index 452b1ad39..2ff574be7 100644 --- a/poky/meta/classes/image.bbclass +++ b/poky/meta/classes/image.bbclass @@ -497,7 +497,7 @@ python () { d.setVarFlag(task, 'fakeroot', '1') d.appendVarFlag(task, 'prefuncs', ' ' + debug + ' set_image_size') - d.prependVarFlag(task, 'postfuncs', ' create_symlinks') + d.prependVarFlag(task, 'postfuncs', 'create_symlinks ') d.appendVarFlag(task, 'subimages', ' ' + ' '.join(subimages)) d.appendVarFlag(task, 'vardeps', ' ' + ' '.join(vardeps)) d.appendVarFlag(task, 'vardepsexclude', 'DATETIME DATE ' + ' '.join(vardepsexclude)) diff --git a/poky/meta/classes/image_types.bbclass b/poky/meta/classes/image_types.bbclass index 05e5b0a2e..0a69542fc 100644 --- a/poky/meta/classes/image_types.bbclass +++ b/poky/meta/classes/image_types.bbclass @@ -239,6 +239,7 @@ EXTRA_IMAGECMD_ext4 ?= "-i 4096" EXTRA_IMAGECMD_btrfs ?= "-n 4096" EXTRA_IMAGECMD_f2fs ?= "" +do_image_cpio[depends] += "cpio-native:do_populate_sysroot" do_image_jffs2[depends] += "mtd-utils-native:do_populate_sysroot" do_image_cramfs[depends] += "util-linux-native:do_populate_sysroot" do_image_ext2[depends] += "e2fsprogs-native:do_populate_sysroot" diff --git a/poky/meta/classes/insane.bbclass b/poky/meta/classes/insane.bbclass index 4644221bc..6718feb3a 100644 --- a/poky/meta/classes/insane.bbclass +++ b/poky/meta/classes/insane.bbclass @@ -383,7 +383,7 @@ def package_qa_hash_style(path, name, d, elf, messages): sane = True if has_syms and not sane: - package_qa_add_message(messages, "ldflags", "No GNU_HASH in the elf binary: '%s'" % path) + package_qa_add_message(messages, "ldflags", "No GNU_HASH in the ELF binary %s, didn't pass LDFLAGS?" % path) QAPATHTEST[buildpaths] = "package_qa_check_buildpaths" diff --git a/poky/meta/classes/libc-package.bbclass b/poky/meta/classes/libc-package.bbclass index 9d09c7be6..345ec2986 100644 --- a/poky/meta/classes/libc-package.bbclass +++ b/poky/meta/classes/libc-package.bbclass @@ -49,13 +49,7 @@ python __anonymous () { OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" -locale_base_postinst() { -#!/bin/sh - -if [ "x$D" != "x" ]; then - exit 1 -fi - +locale_base_postinst_ontarget() { localedef --inputfile=${datadir}/i18n/locales/%s --charmap=%s %s } @@ -215,7 +209,7 @@ python package_do_split_gconvs () { def output_locale_source(name, pkgname, locale, encoding): d.setVar('RDEPENDS_%s' % pkgname, '%slocaledef %s-localedata-%s %s-charmap-%s' % \ (mlprefix, mlprefix+bpn, legitimize_package_name(locale), mlprefix+bpn, legitimize_package_name(encoding))) - d.setVar('pkg_postinst_%s' % pkgname, d.getVar('locale_base_postinst') \ + d.setVar('pkg_postinst_ontarget_%s' % pkgname, d.getVar('locale_base_postinst_ontarget') \ % (locale, encoding, locale)) d.setVar('pkg_postrm_%s' % pkgname, d.getVar('locale_base_postrm') % \ (locale, encoding, locale)) diff --git a/poky/meta/classes/license.bbclass b/poky/meta/classes/license.bbclass index 4cf7f074f..aec6999d9 100644 --- a/poky/meta/classes/license.bbclass +++ b/poky/meta/classes/license.bbclass @@ -309,7 +309,7 @@ def incompatible_license(d, dont_want_licenses, package=None): except oe.license.LicenseError as exc: bb.fatal('%s: %s' % (d.getVar('P'), exc)) return any(not oe.license.license_ok(canonical_license(d, l), \ - dont_want_licenses) for l in licenses) + dont_want_licenses) for l in licenses) def check_license_flags(d): """ diff --git a/poky/meta/classes/linux-kernel-base.bbclass b/poky/meta/classes/linux-kernel-base.bbclass index 89ce71605..ba59222c2 100644 --- a/poky/meta/classes/linux-kernel-base.bbclass +++ b/poky/meta/classes/linux-kernel-base.bbclass @@ -34,8 +34,8 @@ def get_kernelversion_file(p): return None def linux_module_packages(s, d): - suffix = "" - return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) + suffix = "" + return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) # that's all diff --git a/poky/meta/classes/multilib_script.bbclass b/poky/meta/classes/multilib_script.bbclass index 51c9fcc12..dc166d06c 100644 --- a/poky/meta/classes/multilib_script.bbclass +++ b/poky/meta/classes/multilib_script.bbclass @@ -24,9 +24,11 @@ python () { for entry in (d.getVar("MULTILIB_SCRIPTS", False) or "").split(): pkg, script = entry.split(":") + epkg = d.expand(pkg) scriptname = os.path.basename(script) - d.appendVar("ALTERNATIVE_" + pkg, scriptname + " ") + d.appendVar("ALTERNATIVE_" + epkg, " " + scriptname + " ") d.setVarFlag("ALTERNATIVE_LINK_NAME", scriptname, script) d.setVarFlag("ALTERNATIVE_TARGET", scriptname, script + "-${MULTILIB_SUFFIX}") d.appendVar("multilibscript_rename", "\n mv ${PKGD}" + script + " ${PKGD}" + script + "-${MULTILIB_SUFFIX}") + d.appendVar("FILES_" + epkg, " " + script + "-${MULTILIB_SUFFIX}") } diff --git a/poky/meta/classes/populate_sdk_ext.bbclass b/poky/meta/classes/populate_sdk_ext.bbclass index e30c49296..40b0375e0 100644 --- a/poky/meta/classes/populate_sdk_ext.bbclass +++ b/poky/meta/classes/populate_sdk_ext.bbclass @@ -280,6 +280,8 @@ python copy_buildsystem () { # Create local.conf builddir = d.getVar('TOPDIR') + if derivative and os.path.exists(builddir + '/conf/site.conf'): + shutil.copyfile(builddir + '/conf/site.conf', baseoutpath + '/conf/site.conf') if derivative and os.path.exists(builddir + '/conf/auto.conf'): shutil.copyfile(builddir + '/conf/auto.conf', baseoutpath + '/conf/auto.conf') if derivative: @@ -297,6 +299,9 @@ python copy_buildsystem () { return origvalue, op, 0, True varlist = ['[^#=+ ]*'] oldlines = [] + if os.path.exists(builddir + '/conf/site.conf'): + with open(builddir + '/conf/site.conf', 'r') as f: + oldlines += f.readlines() if os.path.exists(builddir + '/conf/auto.conf'): with open(builddir + '/conf/auto.conf', 'r') as f: oldlines += f.readlines() diff --git a/poky/meta/classes/ptest.bbclass b/poky/meta/classes/ptest.bbclass index c19f65b9b..9d8a79854 100644 --- a/poky/meta/classes/ptest.bbclass +++ b/poky/meta/classes/ptest.bbclass @@ -59,6 +59,7 @@ addtask install_ptest_base after do_install before do_package do_populate_sy python () { if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d): d.setVarFlag('do_install_ptest_base', 'fakeroot', '1') + d.setVarFlag('do_install_ptest_base', 'umask', '022') # Remove all '*ptest_base' tasks when ptest is not enabled if not(d.getVar('PTEST_ENABLED') == "1"): diff --git a/poky/meta/classes/reproducible_build.bbclass b/poky/meta/classes/reproducible_build.bbclass index 0eb696ac7..8788ad714 100644 --- a/poky/meta/classes/reproducible_build.bbclass +++ b/poky/meta/classes/reproducible_build.bbclass @@ -22,7 +22,10 @@ # 3. Use the mtime of "known" files such as NEWS, CHANGLELOG, ... # This works for well-kept repositories distributed via tarball. # -# 4. If the above steps fail, use the modification time of the youngest file in the source tree. +# 4. Use the modification time of the youngest file in the source tree, if there is one. +# This will be the newest file from the distribution tarball, if any. +# +# 5. Fall back to a fixed timestamp. # # Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's SDE_FILE. # If none of these mechanisms are suitable, replace the do_deploy_source_date_epoch task @@ -104,15 +107,15 @@ def get_source_date_epoch_from_git(d, sourcedir): return source_date_epoch def get_source_date_epoch_from_youngest_file(d, sourcedir): + if sourcedir == d.getVar('WORKDIR'): + # These sources are almost certainly not from a tarball + return None + # Do it the hard way: check all files and find the youngest one... source_date_epoch = None newest_file = None - # Just in case S = WORKDIR - exclude = set(["build", "image", "license-destdir", "patches", "pseudo", - "recipe-sysroot", "recipe-sysroot-native", "sysroot-destdir", "temp"]) for root, dirs, files in os.walk(sourcedir, topdown=True): files = [f for f in files if not f[0] == '.'] - dirs[:] = [d for d in dirs if d not in exclude] for fname in files: filename = os.path.join(root, fname) @@ -128,6 +131,10 @@ def get_source_date_epoch_from_youngest_file(d, sourcedir): bb.debug(1, "Newest file found: %s" % newest_file) return source_date_epoch +def fixed_source_date_epoch(): + bb.debug(1, "No tarball or git repo found to determine SOURCE_DATE_EPOCH") + return 0 + python do_create_source_date_epoch_stamp() { epochfile = d.getVar('SDE_FILE') if os.path.isfile(epochfile): @@ -139,11 +146,8 @@ python do_create_source_date_epoch_stamp() { get_source_date_epoch_from_git(d, sourcedir) or get_source_date_epoch_from_known_files(d, sourcedir) or get_source_date_epoch_from_youngest_file(d, sourcedir) or - 0 # Last resort + fixed_source_date_epoch() # Last resort ) - if source_date_epoch == 0: - # empty folder, not a single file ... - bb.debug(1, "No files found to determine SOURCE_DATE_EPOCH") bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch) bb.utils.mkdirhier(d.getVar('SDE_DIR')) diff --git a/poky/meta/classes/siteconfig.bbclass b/poky/meta/classes/siteconfig.bbclass index bb491d299..0cfa5a683 100644 --- a/poky/meta/classes/siteconfig.bbclass +++ b/poky/meta/classes/siteconfig.bbclass @@ -1,13 +1,13 @@ python siteconfig_do_siteconfig () { - shared_state = sstate_state_fromvars(d) - if shared_state['task'] != 'populate_sysroot': - return - if not os.path.isdir(os.path.join(d.getVar('FILE_DIRNAME'), 'site_config')): - bb.debug(1, "No site_config directory, skipping do_siteconfig") - return - sstate_install(shared_state, d) - bb.build.exec_func('do_siteconfig_gencache', d) - sstate_clean(shared_state, d) + shared_state = sstate_state_fromvars(d) + if shared_state['task'] != 'populate_sysroot': + return + if not os.path.isdir(os.path.join(d.getVar('FILE_DIRNAME'), 'site_config')): + bb.debug(1, "No site_config directory, skipping do_siteconfig") + return + sstate_install(shared_state, d) + bb.build.exec_func('do_siteconfig_gencache', d) + sstate_clean(shared_state, d) } EXTRASITECONFIG ?= "" diff --git a/poky/meta/classes/sstate.bbclass b/poky/meta/classes/sstate.bbclass index efb0096c7..9f059a04a 100644 --- a/poky/meta/classes/sstate.bbclass +++ b/poky/meta/classes/sstate.bbclass @@ -423,8 +423,9 @@ def sstate_clean_cachefile(ss, d): import oe.path sstatepkgfile = d.getVar('SSTATE_PATHSPEC') + "*_" + ss['task'] + ".tgz*" - bb.note("Removing %s" % sstatepkgfile) - oe.path.remove(sstatepkgfile) + if d.getVarFlag('do_%s' % ss['task'], 'task'): + bb.note("Removing %s" % sstatepkgfile) + oe.path.remove(sstatepkgfile) def sstate_clean_cachefiles(d): for task in (d.getVar('SSTATETASKS') or "").split(): diff --git a/poky/meta/conf/distro/include/maintainers.inc b/poky/meta/conf/distro/include/maintainers.inc index 12785934a..672f06779 100644 --- a/poky/meta/conf/distro/include/maintainers.inc +++ b/poky/meta/conf/distro/include/maintainers.inc @@ -37,19 +37,19 @@ RECIPE_MAINTAINER_pn-alsa-state = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-alsa-tools = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-alsa-utils = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-alsa-utils-scripts = "Tanu Kaskinen <tanuk@iki.fi>" -RECIPE_MAINTAINER_pn-apmd = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-apmd = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-apr = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-apr-util = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-apt = "Aníbal Limón <limon.anibal@gmail.com>" RECIPE_MAINTAINER_pn-apt-native = "Aníbal Limón <limon.anibal@gmail.com>" RECIPE_MAINTAINER_pn-argp-standalone = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-asciidoc = "Yi Zhao <yi.zhao@windriver.com>" -RECIPE_MAINTAINER_pn-aspell = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-assimp = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-aspell = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-assimp = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-at = "Chen Qi <Qi.Chen@windriver.com>" -RECIPE_MAINTAINER_pn-at-spi2-atk = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-at-spi2-core = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-atk = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-at-spi2-atk = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-at-spi2-core = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-atk = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-attr = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-autoconf = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-autoconf-archive = "Robert Yang <liezhi.yang@windriver.com>" @@ -57,11 +57,11 @@ RECIPE_MAINTAINER_pn-automake = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-avahi = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-avahi-ui = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-babeltrace = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-base-files = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-base-passwd = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-base-files = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-base-passwd = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-bash = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-bash-completion = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-bc = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-bc = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-bind = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-binutils = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-binutils-cross = "Khem Raj <raj.khem@gmail.com>" @@ -71,8 +71,8 @@ RECIPE_MAINTAINER_pn-bison = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-bjam-native = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-blktool = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-blktrace = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-bluez5 = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-bmap-tools = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-bluez5 = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-bmap-tools = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-boost = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-bootchart2 = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-bsd-headers = "Khem Raj <raj.khem@gmail.com>" @@ -86,7 +86,7 @@ RECIPE_MAINTAINER_pn-busybox = "Andrej Valek <andrej.valek@siemens.com>" RECIPE_MAINTAINER_pn-busybox-inittab = "Denys Dmytriyenko <denys@ti.com>" RECIPE_MAINTAINER_pn-bzip2 = "Denys Dmytriyenko <denys@ti.com>" RECIPE_MAINTAINER_pn-ca-certificates = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-cairo = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-cairo = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-ccache = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao <yi.zhao@windriver.com>" @@ -108,7 +108,7 @@ RECIPE_MAINTAINER_pn-coreutils = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-cpio = "Denys Dmytriyenko <denys@ti.com>" RECIPE_MAINTAINER_pn-cracklib = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-createrepo-c = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-cronie = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-cronie = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-cross-localedef-native = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-cryptodev-linux = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-cryptodev-module = "Robert Yang <liezhi.yang@windriver.com>" @@ -145,11 +145,11 @@ RECIPE_MAINTAINER_pn-ed = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-eglinfo-fb = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-eglinfo-x11 = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-elfutils = "Hongxu Jia <hongxu.jia@windriver.com>" -RECIPE_MAINTAINER_pn-enchant = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-enchant = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-encodings = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-epiphany = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-ethtool = "Changhyeok Bae <changhyeok.bae@lge.com>" -RECIPE_MAINTAINER_pn-eudev = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-eudev = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-expat = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-expect = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-ffmpeg = "Alexander Kanavin <alex.kanavin@gmail.com>" @@ -187,9 +187,9 @@ RECIPE_MAINTAINER_pn-gettext = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-gettext-minimal-native = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-ghostscript = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-git = "Robert Yang <liezhi.yang@windriver.com>" -RECIPE_MAINTAINER_pn-glew = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-glib-2.0 = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-glib-networking = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-glew = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-glib-2.0 = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-glib-networking = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-glibc = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-glibc-initial = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-glibc-locale = "Khem Raj <raj.khem@gmail.com>" @@ -217,7 +217,7 @@ RECIPE_MAINTAINER_pn-groff = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-grub = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-grub-bootconf = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-grub-efi = "Anuj Mittal <anuj.mittal@intel.com>" -RECIPE_MAINTAINER_pn-gsettings-desktop-schemas = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-gsettings-desktop-schemas = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-gst-examples = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-gst-validate = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-gstreamer1.0 = "Anuj Mittal <anuj.mittal@intel.com>" @@ -236,25 +236,25 @@ RECIPE_MAINTAINER_pn-gtk+3 = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-gtk-doc = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-gtk-icon-utils-native = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-gzip = "Denys Dmytriyenko <denys@ti.com>" -RECIPE_MAINTAINER_pn-harfbuzz = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-harfbuzz = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-hdparm = "Denys Dmytriyenko <denys@ti.com>" RECIPE_MAINTAINER_pn-help2man-native = "Hongxu Jia <hongxu.jia@windriver.com>" -RECIPE_MAINTAINER_pn-hicolor-icon-theme = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-hicolor-icon-theme = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-hwlatdetect = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-i2c-tools = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-i2c-tools = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-icecc-create-env = "Joshua Watt <JPEWhacker@gmail.com>" RECIPE_MAINTAINER_pn-icu = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-ifupdown = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-init-ifupdown = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-ifupdown = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-init-ifupdown = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-initramfs-boot = "Otavio Salvador <otavio.salvador@ossystems.com.br>" RECIPE_MAINTAINER_pn-initramfs-framework = "Otavio Salvador <otavio.salvador@ossystems.com.br>" -RECIPE_MAINTAINER_pn-initramfs-live-boot = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-initramfs-live-boot-tiny = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-initramfs-live-install = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-initramfs-live-install-efi = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-initramfs-live-install-efi-testfs = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-initramfs-live-install-testfs = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-initscripts = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-initramfs-live-boot = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-initramfs-live-boot-tiny = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-initramfs-live-install = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-initramfs-live-install-efi = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-initramfs-live-install-efi-testfs = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-initramfs-live-install-testfs = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-initscripts = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-intltool = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-iproute2 = "Changhyeok Bae <changhyeok.bae@lge.com>" RECIPE_MAINTAINER_pn-iptables = "Changhyeok Bae <changhyeok.bae@lge.com>" @@ -262,7 +262,7 @@ RECIPE_MAINTAINER_pn-iputils = "Changhyeok Bae <changhyeok.bae@lge.com>" RECIPE_MAINTAINER_pn-irda-utils = "Changhyeok Bae <changhyeok.bae@lge.com>" RECIPE_MAINTAINER_pn-iso-codes = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-iw = "Changhyeok Bae <changhyeok.bae@lge.com>" -RECIPE_MAINTAINER_pn-libjpeg-turbo = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-libjpeg-turbo = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-json-c = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-json-glib = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-kbd = "Alexander Kanavin <alex.kanavin@gmail.com>" @@ -273,17 +273,17 @@ RECIPE_MAINTAINER_pn-keymaps = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-kmod = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-kmod-native = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-kmscube = "Carlos Rafael Giani <dv@pseudoterminal.org>" -RECIPE_MAINTAINER_pn-l3afpad = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-l3afpad = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-lame = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-ldconfig-native = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-less = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-liba52 = "Tanu Kaskinen <tanuk@iki.fi>" -RECIPE_MAINTAINER_pn-libacpi = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-libacpi = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libaio = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libarchive = "Otavio Salvador <otavio.salvador@ossystems.com.br>" -RECIPE_MAINTAINER_pn-libart-lgpl = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-libart-lgpl = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libassuan = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libatomic-ops = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-libatomic-ops = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libbsd = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-libcap = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-libcap-ng = "Yi Zhao <yi.zhao@windriver.com>" @@ -291,16 +291,16 @@ RECIPE_MAINTAINER_pn-libcgroup = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libcheck = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-libcomps = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libconvert-asn1-perl = "Tim Orling <timothy.t.orling@linux.intel.com>" -RECIPE_MAINTAINER_pn-libcroco = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-libcroco = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libdaemon = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libdmx = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-libdnf = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libdrm = "Otavio Salvador <otavio.salvador@ossystems.com.br>" -RECIPE_MAINTAINER_pn-libepoxy = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-libepoxy = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-liberation-fonts = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-liberror-perl = "Tim Orling <timothy.t.orling@linux.intel.com>" -RECIPE_MAINTAINER_pn-libevdev = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-libevent = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-libevdev = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-libevent = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libexif = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libfakekey = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libffi = "Alexander Kanavin <alex.kanavin@gmail.com>" @@ -328,44 +328,44 @@ RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-libnl = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-libnotify = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-libnotify = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libnsl2 = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-libnss-mdns = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libnss-nis = "Khem Raj <raj.khem@gmail.com>" -RECIPE_MAINTAINER_pn-libogg = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-libomxil = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-libpam = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-libpcap = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-libogg = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-libomxil = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-libpam = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-libpcap = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libpciaccess = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libpcre = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-libpcre2 = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-libpipeline = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-libpng = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-libproxy = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-libpng = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-libproxy = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libpthread-stubs = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-librepo = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-librsvg = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-librsvg = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libsamplerate0 = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-libsdl = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-libsdl2 = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-libsecret = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libsm = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-libsndfile1 = "Tanu Kaskinen <tanuk@iki.fi>" -RECIPE_MAINTAINER_pn-libsolv = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-libsoup-2.4 = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-libtasn1 = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-libsolv = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-libsoup-2.4 = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-libtasn1 = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libtest-needs-perl = "Tim Orling <timothy.t.orling@linux.intel.com>" RECIPE_MAINTAINER_pn-libtheora = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libtimedate-perl = "Tim Orling <timothy.t.orling@linux.intel.com>" -RECIPE_MAINTAINER_pn-libtirpc = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-libtirpc = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libtool = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-libtool-cross = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-libtool-native = "Robert Yang <liezhi.yang@windriver.com>" -RECIPE_MAINTAINER_pn-libunistring = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-libunistring = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libunwind = "Bruce Ashfield <bruce.ashfield@windriver.com>" RECIPE_MAINTAINER_pn-liburcu = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-liburi-perl = "Tim Orling <timothy.t.orling@linux.intel.com>" -RECIPE_MAINTAINER_pn-libusb1 = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-libusb1 = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libva = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libvorbis = "Tanu Kaskinen <tanuk@iki.fi>" @@ -420,7 +420,7 @@ RECIPE_MAINTAINER_pn-linux-yocto-rt = "Bruce Ashfield <bruce.ashfield@windriver. RECIPE_MAINTAINER_pn-linux-yocto-tiny = "Bruce Ashfield <bruce.ashfield@windriver.com>" RECIPE_MAINTAINER_pn-llvm = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-logrotate = "Yi Zhao <yi.zhao@windriver.com>" -RECIPE_MAINTAINER_pn-lrzsz = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-lrzsz = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-lsb = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-lsbinitscripts = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-lsbtest = "Yi Zhao <yi.zhao@windriver.com>" @@ -465,11 +465,11 @@ RECIPE_MAINTAINER_pn-meta-toolchain = "Richard Purdie <richard.purdie@linuxfound RECIPE_MAINTAINER_pn-meta-world-pkgdata = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-mingetty = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-mini-x-session = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-minicom = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-minicom = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-mkfontdir = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-mkfontscale = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-mklibs-native = "Robert Yang <liezhi.yang@windriver.com>" -RECIPE_MAINTAINER_pn-mmc-utils = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-mmc-utils = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-mobile-broadband-provider-info = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-modutils-initscripts = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-mpeg2dec = "Alexander Kanavin <alex.kanavin@gmail.com>" @@ -477,11 +477,11 @@ RECIPE_MAINTAINER_pn-mpfr = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-mpg123 = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-msmtp = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-mtd-utils = "Denys Dmytriyenko <denys@ti.com>" -RECIPE_MAINTAINER_pn-mtdev = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-mtools = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-mtdev = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-mtools = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-musl = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-musl-utils = "Khem Raj <raj.khem@gmail.com>" -RECIPE_MAINTAINER_pn-mx-1.0 = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-mx-1.0 = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-nasm = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-nativesdk-buildtools-perl-dummy = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-nativesdk-libtool = "Richard Purdie <richard.purdie@linuxfoundation.org>" @@ -489,7 +489,7 @@ RECIPE_MAINTAINER_pn-nativesdk-packagegroup-sdk-host = "Ross Burton <ross.burton RECIPE_MAINTAINER_pn-nativesdk-qemu-helper = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-newlib = "Alejandro Hernandez <aehs29@gmail.com>" RECIPE_MAINTAINER_pn-ncurses = "Hongxu Jia <hongxu.jia@windriver.com>" -RECIPE_MAINTAINER_pn-neard = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-neard = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-net-tools = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-netbase = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-nettle = "Armin Kuster <akuster808@gmail.com>" @@ -499,7 +499,7 @@ RECIPE_MAINTAINER_pn-ninja = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-nspr = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-nss = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-nss-myhostname = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-ofono = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-openssh = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-openssl = "Alexander Kanavin <alex.kanavin@gmail.com>" @@ -508,7 +508,7 @@ RECIPE_MAINTAINER_pn-opkg = "Alejandro del Castillo <alejandro.delcastillo@ni.co RECIPE_MAINTAINER_pn-opkg-arch-config = "Alejandro del Castillo <alejandro.delcastillo@ni.com>" RECIPE_MAINTAINER_pn-opkg-keyrings = "Alejandro del Castillo <alejandro.delcastillo@ni.com>" RECIPE_MAINTAINER_pn-opkg-utils = "Alejandro del Castillo <alejandro.delcastillo@ni.com>" -RECIPE_MAINTAINER_pn-orc = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-orc = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-os-release = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-ovmf = "Ricardo Neri <ricardo.neri-calderon@linux.intel.com>" RECIPE_MAINTAINER_pn-ovmf-shell-image = "Ricardo Neri <ricardo.neri-calderon@linux.intel.com>" @@ -527,12 +527,12 @@ RECIPE_MAINTAINER_pn-perl-native = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-piglit = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-pigz = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-pinentry = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-pixman = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-pixman = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-pkgconf = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-pkgconfig = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-pm-utils = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-pointercal-xinput = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-pong-clock = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-pong-clock = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-popt = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-powertop = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-ppp = "Hongxu Jia <hongxu.jia@windriver.com>" @@ -545,7 +545,7 @@ RECIPE_MAINTAINER_pn-psplash = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-ptest-runner = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-pulseaudio = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-pulseaudio-client-conf-sato = "Tanu Kaskinen <tanuk@iki.fi>" -RECIPE_MAINTAINER_pn-puzzles = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-puzzles = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-python = "Derek Straka <derek@asterius.io>" RECIPE_MAINTAINER_pn-python-native = "Derek Straka <derek@asterius.io>" RECIPE_MAINTAINER_pn-python-nose = "Derek Straka <derek@asterius.io>" @@ -580,13 +580,13 @@ RECIPE_MAINTAINER_pn-qemu-helper-native = "Richard Purdie <richard.purdie@linuxf RECIPE_MAINTAINER_pn-qemuwrapper-cross = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-quilt = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-quilt-native = "Robert Yang <liezhi.yang@windriver.com>" -RECIPE_MAINTAINER_pn-quota = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-quota = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-re2c = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-readline = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-resolvconf = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-rgb = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-rpcbind = "Hongxu Jia <hongxu.jia@windriver.com>" -RECIPE_MAINTAINER_pn-rng-tools = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-rng-tools = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-rpcsvc-proto = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-rpm = "Mark Hatle <mark.hatle@windriver.com>" RECIPE_MAINTAINER_pn-rsync = "Yi Zhao <yi.zhao@windriver.com>" @@ -596,15 +596,15 @@ RECIPE_MAINTAINER_pn-run-postinsts = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-rxvt-unicode = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-sato-screenshot = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-sbc = "Tanu Kaskinen <tanuk@iki.fi>" -RECIPE_MAINTAINER_pn-screen = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-screen = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-sed = "Chen Qi <Qi.Chen@windriver.com>" -RECIPE_MAINTAINER_pn-serf = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-serf = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-setserial = "Yi Zhao <yi.zhao@windriver.com>" -RECIPE_MAINTAINER_pn-settings-daemon = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-settings-daemon = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-shadow = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-shadow-securetty = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-shadow-sysroot = "Chen Qi <Qi.Chen@windriver.com>" -RECIPE_MAINTAINER_pn-shared-mime-info = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-shared-mime-info = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-shutdown-desktop = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-signing-keys = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-slang = "Yi Zhao <yi.zhao@windriver.com>" @@ -612,14 +612,14 @@ RECIPE_MAINTAINER_pn-socat = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-source-highlight = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-speex = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-speexdsp = "Tanu Kaskinen <tanuk@iki.fi>" -RECIPE_MAINTAINER_pn-sqlite3 = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-sqlite3 = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-squashfs-tools = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-startup-notification = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-strace = "Robert Yang <liezhi.yang@windriver.com>" -RECIPE_MAINTAINER_pn-stress = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-stress = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-subversion = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-sudo = "Chen Qi <Qi.Chen@windriver.com>" -RECIPE_MAINTAINER_pn-swig = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-swig = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-sysfsutils = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-sysklogd = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-syslinux = "Alexander Kanavin <alex.kanavin@gmail.com>" @@ -637,18 +637,18 @@ RECIPE_MAINTAINER_pn-systemtap = "Victor Kamensky <kamensky@cisco.com>" RECIPE_MAINTAINER_pn-systemtap-uprobes = "Victor Kamensky <kamensky@cisco.com>" RECIPE_MAINTAINER_pn-sysvinit = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-sysvinit-inittab = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-taglib = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-taglib = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-tar = "Chen Qi <Qi.Chen@windriver.com>" -RECIPE_MAINTAINER_pn-tcf-agent = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-tcf-agent = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-tcl = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-tcp-wrappers = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-testexport-tarball = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-texi2html = "Robert Yang <liezhi.yang@windriver.com>" -RECIPE_MAINTAINER_pn-texinfo = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-texinfo-dummy-native = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-texinfo = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-texinfo-dummy-native = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-tiff = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-time = "Robert Yang <liezhi.yang@windriver.com>" -RECIPE_MAINTAINER_pn-ttf-bitstream-vera = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-ttf-bitstream-vera = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-tzcode-native = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-tzdata = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-u-boot = "Marek Vasut <marek.vasut@gmail.com>" @@ -668,7 +668,7 @@ RECIPE_MAINTAINER_pn-v86d = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-vala = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-valgrind = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-volatile-binds = "Chen Qi <Qi.Chen@windriver.com>" -RECIPE_MAINTAINER_pn-vte = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-vte = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-vulkan = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-vulkan-demos = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-waffle = "Ross Burton <ross.burton@intel.com>" @@ -681,8 +681,8 @@ RECIPE_MAINTAINER_pn-weston = "Denys Dmytriyenko <denys@ti.com>" RECIPE_MAINTAINER_pn-weston-conf = "Denys Dmytriyenko <denys@ti.com>" RECIPE_MAINTAINER_pn-weston-init = "Denys Dmytriyenko <denys@ti.com>" RECIPE_MAINTAINER_pn-wget = "Yi Zhao <yi.zhao@windriver.com>" -RECIPE_MAINTAINER_pn-which = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-wic-tools = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-which = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-wic-tools = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-wpa-supplicant = "Changhyeok Bae <changhyeok.bae@lge.com>" RECIPE_MAINTAINER_pn-x11perf = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-x264 = "Anuj Mittal <anuj.mittal@intel.com>" @@ -694,7 +694,7 @@ RECIPE_MAINTAINER_pn-xcb-util-keysyms = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-xcb-util-renderutil = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-xcb-util-wm = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-xcursor-transparent-theme = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xdg-utils = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-xdg-utils = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-xdpyinfo = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-xev = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-xeyes = "Armin Kuster <akuster808@gmail.com>" @@ -729,7 +729,7 @@ RECIPE_MAINTAINER_pn-xserver-xorg = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-xset = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-xtrans = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-xuser-account = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xvideo-tests = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-xvideo-tests = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-xvinfo = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-xwininfo = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko <denys@ti.com>" diff --git a/poky/meta/conf/licenses.conf b/poky/meta/conf/licenses.conf index 90c486ebe..1058084d8 100644 --- a/poky/meta/conf/licenses.conf +++ b/poky/meta/conf/licenses.conf @@ -12,7 +12,7 @@ SRC_DISTRIBUTE_LICENSES += "CC-BY-NC-3.0 CC-BY-NC-ND-1.0 CC-BY-NC-ND-2.0" SRC_DISTRIBUTE_LICENSES += "CC-BY-NC-ND-2.5 CC-BY-NC-ND-3.0 CC-BY-NC-SA-1.0" SRC_DISTRIBUTE_LICENSES += "CC-BY-NC-SA-2.0 CC-BY-NC-SA-2.5 CC-BY-NC-SA-3.0" SRC_DISTRIBUTE_LICENSES += "CC-BY-ND-1.0 CC-BY-ND-2.0 CC-BY-ND-2.5 CC-BY-ND-3.0" -SRC_DISTRIBUTE_LICENSES += "CC-BY-SA-1.0 CC-BY-SA-2.0 CC-BY-SA-2.5 CC-BY-SA-3.0" +SRC_DISTRIBUTE_LICENSES += "CC-BY-SA-1.0 CC-BY-SA-2.0 CC-BY-SA-2.5 CC-BY-SA-3.0 CC-BY-SA-4.0" SRC_DISTRIBUTE_LICENSES += "CDDL-1.0 CECILL-1.0 CECILL-2.0 CECILL-B CECILL-C" SRC_DISTRIBUTE_LICENSES += "ClArtistic CPAL-1.0 CPL-1.0 CUA-OPL-1.0 DSSSL" SRC_DISTRIBUTE_LICENSES += "ECL-1.0 ECL-2.0 eCos-2.0 EDL-1.0 EFL-1.0 EFL-2.0" diff --git a/poky/meta/files/common-licenses/CC-BY-SA-4.0 b/poky/meta/files/common-licenses/CC-BY-SA-4.0 new file mode 100644 index 000000000..fe8dbc50f --- /dev/null +++ b/poky/meta/files/common-licenses/CC-BY-SA-4.0 @@ -0,0 +1,428 @@ +Attribution-ShareAlike 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-ShareAlike 4.0 International Public +License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-ShareAlike 4.0 International Public License ("Public +License"). To the extent this Public License may be interpreted as a +contract, You are granted the Licensed Rights in consideration of Your +acceptance of these terms and conditions, and the Licensor grants You +such rights in consideration of benefits the Licensor receives from +making the Licensed Material available under these terms and +conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. BY-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + k. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + l. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + m. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + b. ShareAlike. + + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + + including for purposes of Section 3(b); and + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. + diff --git a/poky/meta/recipes-connectivity/iproute2/iproute2_4.18.0.bb b/poky/meta/recipes-connectivity/iproute2/iproute2_4.19.0.bb index 8eed37761..6db4062d6 100644 --- a/poky/meta/recipes-connectivity/iproute2/iproute2_4.18.0.bb +++ b/poky/meta/recipes-connectivity/iproute2/iproute2_4.19.0.bb @@ -6,8 +6,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-ip-Remove-unneed-header.patch \ " -SRC_URI[md5sum] = "8b8680e91390c57cab788fbf8e929479" -SRC_URI[sha256sum] = "a9e6c70c95f513871c5e1f4e452c04fcb3c4d8a05be651bd794cd994a52daa45" +SRC_URI[md5sum] = "67eeebacaac4515cab73dfd2fc796af3" +SRC_URI[sha256sum] = "d9ec5ca1f47d8a85416fa26e7dc1cbf5d067640eb60e90bdc1c7e5bdc6a29984" # CFLAGS are computed in Makefile and reference CCOPTS # diff --git a/poky/meta/recipes-connectivity/openssl/openssl/0002-fix-CVE-2018-0734.patch b/poky/meta/recipes-connectivity/openssl/openssl/0002-fix-CVE-2018-0734.patch deleted file mode 100644 index 2a3e03fe2..000000000 --- a/poky/meta/recipes-connectivity/openssl/openssl/0002-fix-CVE-2018-0734.patch +++ /dev/null @@ -1,108 +0,0 @@ -Backport patch to fix CVE-2018-0734. Remove a section which only remove a -space. It can't be applied because the context is different. - -CVE: CVE-2018-0734 -Upstream-Status: Backport - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -From 8abfe72e8c1de1b95f50aa0d9134803b4d00070f Mon Sep 17 00:00:00 2001 -From: Pauli <paul.dale@oracle.com> -Date: Wed, 24 Oct 2018 07:42:46 +1000 -Subject: [PATCH] Timing vulnerability in DSA signature generation - (CVE-2018-0734). - -Avoid a timing attack that leaks information via a side channel that -triggers when a BN is resized. Increasing the size of the BNs -prior to doing anything with them suppresses the attack. - -Thanks due to Samuel Weiser for finding and locating this. - -Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de> -(Merged from https://github.com/openssl/openssl/pull/7486) - -(cherry picked from commit a9cfb8c2aa7254a4aa6a1716909e3f8cb78049b6) ---- - crypto/dsa/dsa_ossl.c | 28 +++++++++++++++------------- - 1 file changed, 15 insertions(+), 13 deletions(-) - -diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c -index ca20811200..2dd2d7489a 100644 ---- a/crypto/dsa/dsa_ossl.c -+++ b/crypto/dsa/dsa_ossl.c -@@ -9,6 +9,7 @@ - - #include <stdio.h> - #include "internal/cryptlib.h" -+#include "internal/bn_int.h" - #include <openssl/bn.h> - #include <openssl/sha.h> - #include "dsa_locl.h" -@@ -180,9 +181,9 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, - { - BN_CTX *ctx = NULL; - BIGNUM *k, *kinv = NULL, *r = *rp; -- BIGNUM *l, *m; -+ BIGNUM *l; - int ret = 0; -- int q_bits; -+ int q_bits, q_words; - - if (!dsa->p || !dsa->q || !dsa->g) { - DSAerr(DSA_F_DSA_SIGN_SETUP, DSA_R_MISSING_PARAMETERS); -@@ -191,8 +192,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, - - k = BN_new(); - l = BN_new(); -- m = BN_new(); -- if (k == NULL || l == NULL || m == NULL) -+ if (k == NULL || l == NULL) - goto err; - - if (ctx_in == NULL) { -@@ -203,9 +203,9 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, - - /* Preallocate space */ - q_bits = BN_num_bits(dsa->q); -- if (!BN_set_bit(k, q_bits) -- || !BN_set_bit(l, q_bits) -- || !BN_set_bit(m, q_bits)) -+ q_words = bn_get_top(dsa->q); -+ if (!bn_wexpand(k, q_words + 2) -+ || !bn_wexpand(l, q_words + 2)) - goto err; - - /* Get random k */ -@@ -240,14 +240,17 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, - * small timing information leakage. We then choose the sum that is - * one bit longer than the modulus. - * -- * TODO: revisit the BN_copy aiming for a memory access agnostic -- * conditional copy. -+ * There are some concerns about the efficacy of doing this. More -+ * specificly refer to the discussion starting with: -+ * https://github.com/openssl/openssl/pull/7486#discussion_r228323705 -+ * The fix is to rework BN so these gymnastics aren't required. - */ - if (!BN_add(l, k, dsa->q) -- || !BN_add(m, l, dsa->q) -- || !BN_copy(k, BN_num_bits(l) > q_bits ? l : m)) -+ || !BN_add(k, l, dsa->q)) - goto err; - -+ BN_consttime_swap(BN_is_bit_set(l, q_bits), k, l, q_words + 2); -+ - if ((dsa)->meth->bn_mod_exp != NULL) { - if (!dsa->meth->bn_mod_exp(dsa, r, dsa->g, k, dsa->p, ctx, - dsa->method_mont_p)) -@@ -275,7 +278,6 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, - BN_CTX_free(ctx); - BN_clear_free(k); - BN_clear_free(l); -- BN_clear_free(m); - return ret; - } - --- -2.17.0 - diff --git a/poky/meta/recipes-connectivity/openssl/openssl/0003-fix-CVE-2018-0735.patch b/poky/meta/recipes-connectivity/openssl/openssl/0003-fix-CVE-2018-0735.patch deleted file mode 100644 index 736323f0c..000000000 --- a/poky/meta/recipes-connectivity/openssl/openssl/0003-fix-CVE-2018-0735.patch +++ /dev/null @@ -1,50 +0,0 @@ -CVE: CVE-2018-0735 - -Upstream-Status: Backport - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -From b1d6d55ece1c26fa2829e2b819b038d7b6d692b4 Mon Sep 17 00:00:00 2001 -From: Pauli <paul.dale@oracle.com> -Date: Fri, 26 Oct 2018 10:54:58 +1000 -Subject: [PATCH] Timing vulnerability in ECDSA signature generation - (CVE-2018-0735) - -Preallocate an extra limb for some of the big numbers to avoid a reallocation -that can potentially provide a side channel. - -Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de> -(Merged from https://github.com/openssl/openssl/pull/7486) - -(cherry picked from commit 99540ec79491f59ed8b46b4edf130e17dc907f52) ---- - crypto/ec/ec_mult.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c -index 7e1b3650e7..0e0a5e1394 100644 ---- a/crypto/ec/ec_mult.c -+++ b/crypto/ec/ec_mult.c -@@ -206,8 +206,8 @@ int ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r, - */ - cardinality_bits = BN_num_bits(cardinality); - group_top = bn_get_top(cardinality); -- if ((bn_wexpand(k, group_top + 1) == NULL) -- || (bn_wexpand(lambda, group_top + 1) == NULL)) { -+ if ((bn_wexpand(k, group_top + 2) == NULL) -+ || (bn_wexpand(lambda, group_top + 2) == NULL)) { - ECerr(EC_F_EC_SCALAR_MUL_LADDER, ERR_R_BN_LIB); - goto err; - } -@@ -244,7 +244,7 @@ int ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r, - * k := scalar + 2*cardinality - */ - kbit = BN_is_bit_set(lambda, cardinality_bits); -- BN_consttime_swap(kbit, k, lambda, group_top + 1); -+ BN_consttime_swap(kbit, k, lambda, group_top + 2); - - group_top = bn_get_top(group->field); - if ((bn_wexpand(s->X, group_top) == NULL) --- -2.17.0 - diff --git a/poky/meta/recipes-connectivity/openssl/openssl10_1.0.2p.bb b/poky/meta/recipes-connectivity/openssl/openssl10_1.0.2p.bb index 432594070..42f9bcfdc 100644 --- a/poky/meta/recipes-connectivity/openssl/openssl10_1.0.2p.bb +++ b/poky/meta/recipes-connectivity/openssl/openssl10_1.0.2p.bb @@ -354,8 +354,8 @@ openssl_package_preprocess () { for file in `find ${PKGD} -name *.h -o -name *.pc -o -name *.so`; do rm $file done - rm ${PKGD}/usr/bin/openssl - rm ${PKGD}/usr/bin/c_rehash - rmdir ${PKGD}/usr/bin + rm ${PKGD}${bindir}/openssl + rm ${PKGD}${bindir}/c_rehash + rmdir ${PKGD}${bindir} } diff --git a/poky/meta/recipes-connectivity/openssl/openssl_1.1.1.bb b/poky/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb index 1234b64b8..be31e9f76 100644 --- a/poky/meta/recipes-connectivity/openssl/openssl_1.1.1.bb +++ b/poky/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb @@ -15,8 +15,6 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://run-ptest \ file://openssl-c_rehash.sh \ file://0001-skip-test_symbol_presence.patch \ - file://0002-fix-CVE-2018-0734.patch \ - file://0003-fix-CVE-2018-0735.patch \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ " @@ -24,8 +22,8 @@ SRC_URI_append_class-nativesdk = " \ file://environment.d-openssl.sh \ " -SRC_URI[md5sum] = "7079eb017429e0ffb9efb42bf80ccb21" -SRC_URI[sha256sum] = "2836875a0f89c03d0fdf483941512613a50cfb421d6fd94b9f41d7279d586a3d" +SRC_URI[md5sum] = "963deb2272d6be7d4c2458afd2517b73" +SRC_URI[sha256sum] = "fc20130f8b7cbd2fb918b2f14e2f429e109c31ddd0fb38fc5d71d9ffed3f9f41" inherit lib_package multilib_header ptest diff --git a/poky/meta/recipes-connectivity/socat/socat_1.7.3.2.bb b/poky/meta/recipes-connectivity/socat/socat_1.7.3.2.bb index 927df7463..b2d6b1dea 100644 --- a/poky/meta/recipes-connectivity/socat/socat_1.7.3.2.bb +++ b/poky/meta/recipes-connectivity/socat/socat_1.7.3.2.bb @@ -7,7 +7,7 @@ SECTION = "console/network" DEPENDS = "openssl readline" -LICENSE = "GPL-2.0+-with-OpenSSL-exception" +LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://README;beginline=257;endline=287;md5=338c05eadd013872abb1d6e198e10a3f" diff --git a/poky/meta/recipes-core/busybox/busybox.inc b/poky/meta/recipes-core/busybox/busybox.inc index 09433dd82..0c0d26ed3 100644 --- a/poky/meta/recipes-core/busybox/busybox.inc +++ b/poky/meta/recipes-core/busybox/busybox.inc @@ -55,35 +55,35 @@ inherit cml1 systemd update-rc.d ptest # internal helper def busybox_cfg(feature, tokens, cnf, rem): - if type(tokens) == type(""): - tokens = [tokens] - rem.extend(['/^[# ]*' + token + '[ =]/d' for token in tokens]) - if feature: - cnf.extend([token + '=y' for token in tokens]) - else: - cnf.extend(['# ' + token + ' is not set' for token in tokens]) + if type(tokens) == type(""): + tokens = [tokens] + rem.extend(['/^[# ]*' + token + '[ =]/d' for token in tokens]) + if feature: + cnf.extend([token + '=y' for token in tokens]) + else: + cnf.extend(['# ' + token + ' is not set' for token in tokens]) # Map distro features to config settings def features_to_busybox_settings(d): - cnf, rem = ([], []) - busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IPV6', cnf, rem) - busybox_cfg(True, 'CONFIG_LFS', cnf, rem) - busybox_cfg(True, 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem) - busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'nls', True, False, d), 'CONFIG_LOCALE_SUPPORT', cnf, rem) - busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv4', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem) - busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem) - busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'wifi', True, False, d), 'CONFIG_RFKILL', cnf, rem) - busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'bluetooth', True, False, d), 'CONFIG_RFKILL', cnf, rem) - return "\n".join(cnf), "\n".join(rem) + cnf, rem = ([], []) + busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IPV6', cnf, rem) + busybox_cfg(True, 'CONFIG_LFS', cnf, rem) + busybox_cfg(True, 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem) + busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'nls', True, False, d), 'CONFIG_LOCALE_SUPPORT', cnf, rem) + busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv4', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem) + busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem) + busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'wifi', True, False, d), 'CONFIG_RFKILL', cnf, rem) + busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'bluetooth', True, False, d), 'CONFIG_RFKILL', cnf, rem) + return "\n".join(cnf), "\n".join(rem) # X, Y = ${@features_to_busybox_settings(d)} # unfortunately doesn't seem to work with bitbake, workaround: def features_to_busybox_conf(d): - cnf, rem = features_to_busybox_settings(d) - return cnf + cnf, rem = features_to_busybox_settings(d) + return cnf def features_to_busybox_del(d): - cnf, rem = features_to_busybox_settings(d) - return rem + cnf, rem = features_to_busybox_settings(d) + return rem configmangle = '/CONFIG_EXTRA_CFLAGS/d; \ ' diff --git a/poky/meta/recipes-core/coreutils/coreutils_8.30.bb b/poky/meta/recipes-core/coreutils/coreutils_8.30.bb index 205ba4a0a..8f4ee5571 100644 --- a/poky/meta/recipes-core/coreutils/coreutils_8.30.bb +++ b/poky/meta/recipes-core/coreutils/coreutils_8.30.bb @@ -129,11 +129,11 @@ ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" ALTERNATIVE_LINK_NAME[stat.1] = "${mandir}/man1/stat.1" python __anonymous() { - for prog in d.getVar('base_bindir_progs').split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) + for prog in d.getVar('base_bindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) - for prog in d.getVar('sbindir_progs').split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog)) + for prog in d.getVar('sbindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog)) } BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb index f03ef969a..c4c369cab 100644 --- a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -22,7 +22,7 @@ IMAGE_FSTYPES = "wic.vmdk" inherit core-image module-base setuptools3 -SRCREV ?= "53332c9f1bd270f34a290fea68fde1d3ff41f86e" +SRCREV ?= "ca417455d79b29cd14cd8d39a9da904bf23fcc48" SRC_URI = "git://git.yoctoproject.org/poky;branch=thud \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ @@ -116,9 +116,9 @@ IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; " addtask rootfs after do_unpack python () { - # Ensure we run these usually noexec tasks - d.delVarFlag("do_fetch", "noexec") - d.delVarFlag("do_unpack", "noexec") + # Ensure we run these usually noexec tasks + d.delVarFlag("do_fetch", "noexec") + d.delVarFlag("do_unpack", "noexec") } create_bundle_files () { diff --git a/poky/meta/recipes-core/systemd/systemd_239.bb b/poky/meta/recipes-core/systemd/systemd_239.bb index 3dbeaac34..ed10f634b 100644 --- a/poky/meta/recipes-core/systemd/systemd_239.bb +++ b/poky/meta/recipes-core/systemd/systemd_239.bb @@ -239,6 +239,9 @@ do_install() { # Delete journal README, as log can be symlinked inside volatile. rm -f ${D}/${localstatedir}/log/README + # journal-remote creates this at start + rm -rf ${D}/${localstatedir}/log/journal/remote + install -d ${D}${systemd_unitdir}/system/graphical.target.wants install -d ${D}${systemd_unitdir}/system/multi-user.target.wants install -d ${D}${systemd_unitdir}/system/poweroff.target.wants @@ -309,19 +312,35 @@ PACKAGES =+ "\ ${PN}-zsh-completion \ ${PN}-xorg-xinitrc \ ${PN}-container \ + ${PN}-journal-gatewayd \ + ${PN}-journal-upload \ + ${PN}-journal-remote \ ${PN}-extra-utils \ " SUMMARY_${PN}-container = "Tools for containers and VMs" DESCRIPTION_${PN}-container = "Systemd tools to spawn and manage containers and virtual machines." -SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)}" +SUMMARY_${PN}-journal-gatewayd = "HTTP server for journal events" +DESCRIPTION_${PN}-journal-gatewayd = "systemd-journal-gatewayd serves journal events over the network. Clients must connect using HTTP. The server listens on port 19531 by default." + +SUMMARY_${PN}-journal-upload = "Send journal messages over the network" +DESCRIPTION_${PN}-journal-upload = "systemd-journal-upload uploads journal entries to a specified URL." + +SUMMARY_${PN}-journal-remote = "Receive journal messages over the network" +DESCRIPTION_${PN}-journal-remote = "systemd-journal-remote is a command to receive serialized journal events and store them to journal files." + +SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gatewayd', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', '', '${PN}-journal-remote', '', d)} \ +" SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" -USERADD_PACKAGES = "${PN} ${PN}-extra-utils" -USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '--system -d / -M --shell /bin/nologin systemd-journal-gateway;', '', d)}" -USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '--system -d / -M --shell /bin/nologin systemd-journal-remote;', '', d)}" -USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '--system -d / -M --shell /bin/nologin systemd-journal-upload;', '', d)}" +USERADD_PACKAGES = "${PN} ${PN}-extra-utils ${PN}-journal-gateway ${PN}-journal-upload ${PN}-journal-remote" +USERADD_PARAM_${PN}-journal-gateway += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '--system -d / -M --shell /bin/nologin systemd-journal-gateway;', '', d)}" +USERADD_PARAM_${PN}-journal-remote += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '--system -d / -M --shell /bin/nologin systemd-journal-remote;', '', d)}" +USERADD_PARAM_${PN}-journal-upload += "${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '--system -d / -M --shell /bin/nologin systemd-journal-upload;', '', d)}" USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /bin/nologin systemd-timesync;', '', d)}" USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /bin/nologin systemd-network;', '', d)}" USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /bin/nologin systemd-coredump;', '', d)}" @@ -362,6 +381,29 @@ RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc" RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" + +FILES_${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewayd \ + ${systemd_system_unitdir}/systemd-journal-gatewayd.service \ + ${systemd_system_unitdir}/systemd-journal-gatewayd.socket \ + ${systemd_system_unitdir}/sockets.target.wants/systemd-journal-gatewayd.socket \ + ${datadir}/systemd/gatewayd/browse.html \ + " +SYSTEMD_SERVICE_${PN}-journal-gatewayd = "systemd-journal-gatewayd.socket" + +FILES_${PN}-journal-upload = "${rootlibexecdir}/systemd/systemd-journal-upload \ + ${systemd_system_unitdir}/systemd-journal-upload.service \ + ${sysconfdir}/systemd/journal-upload.conf \ + " +SYSTEMD_SERVICE_${PN}-journal-upload = "systemd-journal-upload.service" + +FILES_${PN}-journal-remote = "${rootlibexecdir}/systemd/systemd-journal-remote \ + ${sysconfdir}/systemd/journal-remote.conf \ + ${systemd_system_unitdir}/systemd-journal-remote.service \ + ${systemd_system_unitdir}/systemd-journal-remote.socket \ + " +SYSTEMD_SERVICE_${PN}-remote = "systemd-journal-remote.socket" + + FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \ ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \ ${base_bindir}/machinectl \ @@ -380,9 +422,6 @@ FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.c ${systemd_system_unitdir}/var-lib-machines.mount \ ${rootlibexecdir}/systemd/systemd-import \ ${rootlibexecdir}/systemd/systemd-importd \ - ${rootlibexecdir}/systemd/systemd-journal-gatewayd \ - ${rootlibexecdir}/systemd/systemd-journal-remote \ - ${rootlibexecdir}/systemd/systemd-journal-upload \ ${rootlibexecdir}/systemd/systemd-machined \ ${rootlibexecdir}/systemd/systemd-pull \ ${exec_prefix}/lib/tmpfiles.d/systemd-nspawn.conf \ @@ -396,6 +435,12 @@ FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.c ${datadir}/polkit-1/actions/org.freedesktop.machine1.policy \ " +RRECOMMENDS_${PN}-container += "\ + ${PN}-journal-upload \ + ${PN}-journal-remote \ + ${PN}-journal-gatewayd \ + " + FILES_${PN}-extra-utils = "\ ${base_bindir}/systemd-escape \ ${base_bindir}/systemd-inhibit \ diff --git a/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch b/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch new file mode 100644 index 000000000..6de9c0557 --- /dev/null +++ b/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch @@ -0,0 +1,73 @@ +From 80810f04f2de6bae6e394f52ad9cdd2189862f74 Mon Sep 17 00:00:00 2001 +From: Jaroslav Rohel <jrohel@redhat.com> +Date: Fri, 9 Nov 2018 07:35:13 +0100 +Subject: [PATCH] Fix setup of logging (log domains) (RhBug:1645897) + +New debug messages were added into GLib library. These messages come +from the "GLib" log domain and were not hidden in the standard and +quiet mode of the application. +This fix hides log messages regardless on source log domain. + +Upstream-Status: Backport + +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +--- + src/createrepo_shared.c | 19 ++++++------------- + src/misc.c | 5 ++++- + 2 files changed, 10 insertions(+), 14 deletions(-) + +diff --git a/src/createrepo_shared.c b/src/createrepo_shared.c +index 8a26787..7cb8ba8 100644 +--- a/src/createrepo_shared.c ++++ b/src/createrepo_shared.c +@@ -270,24 +270,17 @@ cr_lock_repo(const gchar *repo_dir, + void + cr_setup_logging(gboolean quiet, gboolean verbose) + { +- g_log_set_default_handler (cr_log_fn, NULL); +- + if (quiet) { + // Quiet mode +- GLogLevelFlags levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | +- G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING; +- g_log_set_handler(NULL, levels, cr_null_log_fn, NULL); +- g_log_set_handler("C_CREATEREPOLIB", levels, cr_null_log_fn, NULL); ++ GLogLevelFlags hidden_levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | ++ G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING; ++ g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(hidden_levels)); + } else if (verbose) { + // Verbose mode +- GLogLevelFlags levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | +- G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING; +- g_log_set_handler(NULL, levels, cr_log_fn, NULL); +- g_log_set_handler("C_CREATEREPOLIB", levels, cr_log_fn, NULL); ++ g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(0)); + } else { + // Standard mode +- GLogLevelFlags levels = G_LOG_LEVEL_DEBUG; +- g_log_set_handler(NULL, levels, cr_null_log_fn, NULL); +- g_log_set_handler("C_CREATEREPOLIB", levels, cr_null_log_fn, NULL); ++ GLogLevelFlags hidden_levels = G_LOG_LEVEL_DEBUG; ++ g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(hidden_levels)); + } + } +diff --git a/src/misc.c b/src/misc.c +index 9937480..9549a44 100644 +--- a/src/misc.c ++++ b/src/misc.c +@@ -912,8 +912,11 @@ void + cr_log_fn(const gchar *log_domain, + GLogLevelFlags log_level, + const gchar *message, +- G_GNUC_UNUSED gpointer user_data) ++ gpointer user_data) + { ++ gint hidden_log_levels = GPOINTER_TO_INT(user_data); ++ if (log_level & hidden_log_levels) ++ return; + switch(log_level) { + case G_LOG_LEVEL_ERROR: + if (log_domain) g_printerr("%s: ", log_domain); +-- +1.8.3.1 + diff --git a/poky/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb b/poky/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb index 296081104..08766b312 100644 --- a/poky/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb +++ b/poky/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0001-Correctly-install-the-shared-library.patch \ + file://0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch \ " PV = "0.11.1+git${SRCPV}" diff --git a/poky/meta/recipes-devtools/elfutils/elfutils_0.174.bb b/poky/meta/recipes-devtools/elfutils/elfutils_0.175.bb index c30265b53..b0b9ddc73 100644 --- a/poky/meta/recipes-devtools/elfutils/elfutils_0.174.bb +++ b/poky/meta/recipes-devtools/elfutils/elfutils_0.175.bb @@ -6,36 +6,32 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "libtool bzip2 zlib virtual/libintl" DEPENDS_append_libc-musl = " argp-standalone fts " # The Debian patches below are from: -# http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz +# http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.175-1.debian.tar.xz SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://0001-dso-link-change.patch \ file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \ file://0003-fixheadercheck.patch \ file://0004-Disable-the-test-to-convert-euc-jp.patch \ - file://0005-fix-a-stack-usage-warning.patch \ file://0006-Fix-build-on-aarch64-musl.patch \ file://0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch \ file://0001-libasm-may-link-with-libbz2-if-found.patch \ file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ - file://0001-libdwfl-Sanity-check-partial-core-file-data-reads.patch \ - file://0001-size-Handle-recursive-ELF-ar-files.patch \ - file://0001-arlib-Check-that-sh_entsize-isn-t-zero.patch \ - file://debian/0001-hppa_backend.patch \ - file://debian/0001-arm_backend.patch \ - file://debian/0001-mips_backend.patch \ - file://debian/0001-testsuite-ignore-elflint.patch \ - file://debian/0001-mips_readelf_w.patch \ + file://debian/hppa_backend.diff \ + file://debian/arm_backend.diff \ + file://debian/mips_backend.diff \ + file://debian/mips_readelf_w.patch \ + file://debian/kfreebsd_path.patch \ file://debian/0001-Ignore-differences-between-mips-machine-identifiers.patch \ file://debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch \ file://debian/0003-Add-mips-n64-relocation-format-hack.patch \ + file://debian/hurd_path.patch \ file://debian/ignore_strmerge.diff \ - file://debian/0001-fix-gcc7-ftbfs.patch \ - file://debian/0001-disable_werror.patch \ + file://debian/disable_werror.patch \ " SRC_URI_append_libc-musl = " file://0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch" -SRC_URI[md5sum] = "48bec24c0c8b2c16820326956dff9378" -SRC_URI[sha256sum] = "cdf27e70076e10a29539d89e367101d516bc4aa11b0d7777fe52139e3fcad08a" +SRC_URI[md5sum] = "9a02b0382b78cc2d515fb950275d4c02" +SRC_URI[sha256sum] = "f7ef925541ee32c6d15ae5cb27da5f119e01a5ccdbe9fe57bf836730d7b7a65b" inherit autotools gettext diff --git a/poky/meta/recipes-devtools/elfutils/files/0001-arlib-Check-that-sh_entsize-isn-t-zero.patch b/poky/meta/recipes-devtools/elfutils/files/0001-arlib-Check-that-sh_entsize-isn-t-zero.patch deleted file mode 100644 index 86cf7c8d5..000000000 --- a/poky/meta/recipes-devtools/elfutils/files/0001-arlib-Check-that-sh_entsize-isn-t-zero.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b518841fbc1431d7c5baa016e35f10fb647b5958 Mon Sep 17 00:00:00 2001 -From: Mark Wielaard <mark@klomp.org> -Date: Thu, 18 Oct 2018 19:01:52 +0200 -Subject: [PATCH] arlib: Check that sh_entsize isn't zero. - -A bogus ELF file could have sh_entsize as zero. Don't divide by zero, -but just assume there are no symbols in the section. - -https://sourceware.org/bugzilla/show_bug.cgi?id=23786 - -Signed-off-by: Mark Wielaard <mark@klomp.org> - -CVE: CVE-2018-18521 -Upstream-Status: Backport [http://sourceware.org/git/elfutils.git] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - src/arlib.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/arlib.c b/src/arlib.c -index 778e087..a6521e3 100644 ---- a/src/arlib.c -+++ b/src/arlib.c -@@ -252,6 +252,9 @@ arlib_add_symbols (Elf *elf, const char *arfname, const char *membername, - if (data == NULL) - continue; - -+ if (shdr->sh_entsize == 0) -+ continue; -+ - int nsyms = shdr->sh_size / shdr->sh_entsize; - for (int ndx = shdr->sh_info; ndx < nsyms; ++ndx) - { --- -2.7.4 - diff --git a/poky/meta/recipes-devtools/elfutils/files/0001-libdwfl-Sanity-check-partial-core-file-data-reads.patch b/poky/meta/recipes-devtools/elfutils/files/0001-libdwfl-Sanity-check-partial-core-file-data-reads.patch deleted file mode 100644 index 2c74a8d5d..000000000 --- a/poky/meta/recipes-devtools/elfutils/files/0001-libdwfl-Sanity-check-partial-core-file-data-reads.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 8cbb2f8de89d65ca52d4242f213a6206b48d2c8d Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 2 Nov 2018 14:22:31 +0800 -Subject: [PATCH] libdwfl: Sanity check partial core file data reads. - -There were two issues when reading note data from a core file. -We didn't check if the data we already had in a buffer was big -enough. And if we did get the data, we should check if we got -everything, or just a part of the data. - -https://sourceware.org/bugzilla/show_bug.cgi?id=23752 - -Signed-off-by: Mark Wielaard <mark@klomp.org> - -CVE: CVE-2018-18310 -Upstream-Status: Backport [http://sourceware.org/git/elfutils.git] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - libdwfl/dwfl_segment_report_module.c | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/libdwfl/dwfl_segment_report_module.c b/libdwfl/dwfl_segment_report_module.c -index 36e5c82..8749884 100644 ---- a/libdwfl/dwfl_segment_report_module.c -+++ b/libdwfl/dwfl_segment_report_module.c -@@ -1,5 +1,5 @@ - /* Sniff out modules from ELF headers visible in memory segments. -- Copyright (C) 2008-2012, 2014, 2015 Red Hat, Inc. -+ Copyright (C) 2008-2012, 2014, 2015, 2018 Red Hat, Inc. - This file is part of elfutils. - - This file is free software; you can redistribute it and/or modify -@@ -301,7 +301,10 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name, - inline bool read_portion (void **data, size_t *data_size, - GElf_Addr vaddr, size_t filesz) - { -- if (vaddr - start + filesz > buffer_available -+ /* Check whether we will have to read the segment data, or if it -+ can be returned from the existing buffer. */ -+ if (filesz > buffer_available -+ || vaddr - start > buffer_available - filesz - /* If we're in string mode, then don't consider the buffer we have - sufficient unless it contains the terminator of the string. */ - || (filesz == 0 && memchr (vaddr - start + buffer, '\0', -@@ -459,6 +462,12 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name, - if (read_portion (&data, &data_size, vaddr, filesz)) - return; - -+ /* data_size will be zero if we got everything from the initial -+ buffer, otherwise it will be the size of the new buffer that -+ could be read. */ -+ if (data_size != 0) -+ filesz = data_size; -+ - assert (sizeof (Elf32_Nhdr) == sizeof (Elf64_Nhdr)); - - void *notes; --- -2.7.4 - diff --git a/poky/meta/recipes-devtools/elfutils/files/0001-size-Handle-recursive-ELF-ar-files.patch b/poky/meta/recipes-devtools/elfutils/files/0001-size-Handle-recursive-ELF-ar-files.patch deleted file mode 100644 index 6fed82692..000000000 --- a/poky/meta/recipes-devtools/elfutils/files/0001-size-Handle-recursive-ELF-ar-files.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 440d34d0ee37964453245895d38d7fc31bcf3d7d Mon Sep 17 00:00:00 2001 -From: Mark Wielaard <mark@klomp.org> -Date: Thu, 18 Oct 2018 23:15:48 +0200 -Subject: [PATCH] size: Handle recursive ELF ar files. - -eu-size didn't handle an ELF ar file that contained an ar file itself -correctly. handle_ar would recursively call itself but close the ELF -file before returning. Only close the ELF file at the top-level. - -https://sourceware.org/bugzilla/show_bug.cgi?id=23787 - -Signed-off-by: Mark Wielaard <mark@klomp.org> - -CVE: CVE-2018-18520 -Upstream-Status: Backport [http://sourceware.org/git/elfutils.git] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - src/size.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/size.c b/src/size.c -index 5ff3f2a..f01fd88 100644 ---- a/src/size.c -+++ b/src/size.c -@@ -374,8 +374,10 @@ handle_ar (int fd, Elf *elf, const char *prefix, const char *fname) - INTERNAL_ERROR (fname); - } - -- if (unlikely (elf_end (elf) != 0)) -- INTERNAL_ERROR (fname); -+ /* Only close ELF handle if this was a "top level" ar file. */ -+ if (prefix == NULL) -+ if (unlikely (elf_end (elf) != 0)) -+ INTERNAL_ERROR (fname); - - return result; - } --- -2.7.4 - diff --git a/poky/meta/recipes-devtools/elfutils/files/0005-fix-a-stack-usage-warning.patch b/poky/meta/recipes-devtools/elfutils/files/0005-fix-a-stack-usage-warning.patch deleted file mode 100644 index e2966cbea..000000000 --- a/poky/meta/recipes-devtools/elfutils/files/0005-fix-a-stack-usage-warning.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4d7ea681932556ad881f6841de90d0bfff56f8d7 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 15 Aug 2017 17:25:16 +0800 -Subject: [PATCH 5/7] fix a stack-usage warning - -Upstream-Status: Pending - -not use a variable to as a array size, otherwise the warning to error -that -stack usage might be unbounded [-Werror=stack-usage=] will happen - -Signed-off-by: Roy Li <rongqing.li@windriver.com> - -Rebase to 0.170 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - backends/ppc_initreg.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c -index 3e4432f..59c2d97 100644 ---- a/backends/ppc_initreg.c -+++ b/backends/ppc_initreg.c -@@ -94,7 +94,7 @@ ppc_set_initial_registers_tid (pid_t tid __attribute__ ((unused)), - return false; - } - const size_t gprs = sizeof (user_regs.r.gpr) / sizeof (*user_regs.r.gpr); -- Dwarf_Word dwarf_regs[gprs]; -+ Dwarf_Word dwarf_regs[sizeof (user_regs.r.gpr) / sizeof (*user_regs.r.gpr)]; - for (unsigned gpr = 0; gpr < gprs; gpr++) - dwarf_regs[gpr] = user_regs.r.gpr[gpr]; - if (! setfunc (0, gprs, dwarf_regs, arg)) --- -2.7.4 - diff --git a/poky/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch b/poky/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch index 0f01a3218..41981f4aa 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch @@ -7,7 +7,7 @@ Subject: [PATCH] build: Provide alternatives for glibc assumptions helps Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> -Rebase to 0.174 +Rebase to 0.175 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- @@ -129,7 +129,7 @@ index 7bcf61c..c345797 100644 return elf_errmsg (error & 0xffff); case OTHER_ERROR (LIBDW): diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c -index af6838a..c079d6a 100644 +index 56e6105..f4a0649 100644 --- a/libdwfl/dwfl_module_getdwarf.c +++ b/libdwfl/dwfl_module_getdwarf.c @@ -35,6 +35,7 @@ @@ -161,12 +161,12 @@ index f849128..6f0aca1 100644 #define crc32 __libdwfl_crc32 #include <libdwflP.h> diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c -index 9d0fef2..9fc09b8 100644 +index 360e4ee..b5aa397 100644 --- a/libdwfl/linux-kernel-modules.c +++ b/libdwfl/linux-kernel-modules.c -@@ -40,6 +40,7 @@ - #include <system.h> +@@ -41,6 +41,7 @@ + #include "libelfP.h" #include "libdwflP.h" +#include "system.h" #include <inttypes.h> @@ -198,7 +198,7 @@ index 5dc632b..14da1b7 100644 #endif /* elf.h */ diff --git a/libelf/libelf.h b/libelf/libelf.h -index d11358c..4cf9272 100644 +index 1ff11c9..c21e018 100644 --- a/libelf/libelf.h +++ b/libelf/libelf.h @@ -29,6 +29,7 @@ @@ -210,7 +210,7 @@ index d11358c..4cf9272 100644 #include <sys/types.h> diff --git a/libelf/libelfP.h b/libelf/libelfP.h -index ed216c8..415e6f6 100644 +index 9f3e8e9..10a347a 100644 --- a/libelf/libelfP.h +++ b/libelf/libelfP.h @@ -32,6 +32,7 @@ diff --git a/poky/meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch b/poky/meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch index 8c48f4d1b..fa3a3c66b 100644 --- a/poky/meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch +++ b/poky/meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch @@ -1,6 +1,3 @@ -Upstream-Status: Pending [from debian] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - From 77cb4a53c270d5854d3af24f19547bc3de825233 Mon Sep 17 00:00:00 2001 From: James Cowgill <james410@cowgill.org.uk> Date: Mon, 5 Jan 2015 15:16:58 +0000 @@ -11,6 +8,8 @@ from the elf machine id. Also, the EM_MIPS_RS3_LE machine is dead anyway (the kernel will not load binaries containing it). Signed-off-by: James Cowgill <james410@cowgill.org.uk> +Upstream-Status: Pending [from debian] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- backends/mips_init.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/poky/meta/recipes-devtools/elfutils/files/debian/0001-disable_werror.patch b/poky/meta/recipes-devtools/elfutils/files/debian/0001-disable_werror.patch deleted file mode 100644 index 0f32b8742..000000000 --- a/poky/meta/recipes-devtools/elfutils/files/debian/0001-disable_werror.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5d45565e71ddab3d7848077b61eb0ca73c0bcbcc Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 29 Jun 2018 16:01:14 +0800 -Subject: [PATCH] disable -Werror as it tends to break with new gcc versions - -Bug-Debian: https://bugs.debian.org/886004 -Last-Update: 2018-01-01 - -Signed-off-by: Helmut Grohne <helmut@subdivi.de> - -Upstream-Status: Pending [from debian] -mdisable_werror.patc and rebase to 0.172 - -http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - config/eu.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/config/eu.am b/config/eu.am -index c2cc349..99b368e 100644 ---- a/config/eu.am -+++ b/config/eu.am -@@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ - -Wold-style-definition -Wstrict-prototypes \ - $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ - $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ -- $(if $($(*F)_no_Werror),,-Werror) \ - $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ - $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ - $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \ --- -2.7.4 - diff --git a/poky/meta/recipes-devtools/elfutils/files/debian/0001-fix-gcc7-ftbfs.patch b/poky/meta/recipes-devtools/elfutils/files/debian/0001-fix-gcc7-ftbfs.patch deleted file mode 100644 index 26869a3a7..000000000 --- a/poky/meta/recipes-devtools/elfutils/files/debian/0001-fix-gcc7-ftbfs.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 91c0a0da2a8932f163d57db5d9d847bed6822502 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 29 Jun 2018 15:59:57 +0800 -Subject: [PATCH] fix gcc7 ftbfs - -Upstream-Status: Pending [from debian] -fix-gcc7-ftbfs.diff and rebase to 0.172 - -http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - backends/mips_retval.c | 1 + - backends/parisc_retval.c | 1 + - src/ar.c | 2 +- - 3 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/backends/mips_retval.c b/backends/mips_retval.c -index 57487bb..e7973a8 100644 ---- a/backends/mips_retval.c -+++ b/backends/mips_retval.c -@@ -390,6 +390,7 @@ mips_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp) - } - - /* Fallthrough to handle large types */ -+ /* Fall through. */ - - case DW_TAG_array_type: - large: -diff --git a/backends/parisc_retval.c b/backends/parisc_retval.c -index df7ec3a..988e1fe 100644 ---- a/backends/parisc_retval.c -+++ b/backends/parisc_retval.c -@@ -167,6 +167,7 @@ parisc_return_value_location_ (Dwarf_Die *functypedie, const Dwarf_Op **locp, in - - /* Else fall through. */ - } -+ /* Fall through. */ - - case DW_TAG_structure_type: - case DW_TAG_class_type: -diff --git a/src/ar.c b/src/ar.c -index 818115b..c77e9f4 100644 ---- a/src/ar.c -+++ b/src/ar.c -@@ -1073,7 +1073,7 @@ do_oper_delete (const char *arfname, char **argv, int argc, - static bool - no0print (bool ofmt, char *buf, int bufsize, long int val) - { -- char tmpbuf[bufsize + 1]; -+ char tmpbuf[bufsize + 1 + 4]; - int ret = snprintf (tmpbuf, sizeof (tmpbuf), ofmt ? "%-*lo" : "%-*ld", - bufsize, val); - if (ret >= (int) sizeof (tmpbuf)) --- -2.7.4 - diff --git a/poky/meta/recipes-devtools/elfutils/files/debian/0001-mips_readelf_w.patch b/poky/meta/recipes-devtools/elfutils/files/debian/0001-mips_readelf_w.patch deleted file mode 100644 index f3ab3da8d..000000000 --- a/poky/meta/recipes-devtools/elfutils/files/debian/0001-mips_readelf_w.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a188ea1ada6b990b72b91266ae02da058dcd9523 Mon Sep 17 00:00:00 2001 -From: Kurt Roeckx <kurt@roeckx.be> -Date: Fri, 29 Jun 2018 15:49:32 +0800 -Subject: [PATCH] Make readelf -w output debug information on mips - -Bug-Debian: http://bugs.debian.org/662041 -Forwarded: not-needed - -Upstreams wants a change where this is handled by a hook that needs -to be filled in by the backend for the arch. - -Signed-off-by: Kurt Roeckx <kurt@roeckx.be> - -Upstream-Status: Pending [from debian] -mips_readelf_w.patch and rebase to 0.172 - -http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - src/readelf.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/readelf.c b/src/readelf.c -index f185897..0db197c 100644 ---- a/src/readelf.c -+++ b/src/readelf.c -@@ -10979,7 +10979,8 @@ print_debug (Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr) - GElf_Shdr shdr_mem; - GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem); - -- if (shdr != NULL && shdr->sh_type == SHT_PROGBITS) -+ if (shdr != NULL && ( -+ (shdr->sh_type == SHT_PROGBITS) || (shdr->sh_type == SHT_MIPS_DWARF))) - { - static const struct - { --- -2.7.4 - diff --git a/poky/meta/recipes-devtools/elfutils/files/debian/0001-testsuite-ignore-elflint.patch b/poky/meta/recipes-devtools/elfutils/files/debian/0001-testsuite-ignore-elflint.patch deleted file mode 100644 index f4c6f40fc..000000000 --- a/poky/meta/recipes-devtools/elfutils/files/debian/0001-testsuite-ignore-elflint.patch +++ /dev/null @@ -1,57 +0,0 @@ -From fe7613a3b9f2443cc11917826348d4521f267c96 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 29 Jun 2018 15:48:33 +0800 -Subject: [PATCH] testsuite ignore elflint - -On many architectures this test fails because binaries/libs produced by -binutils don't pass elflint. However elfutils shouldn't FTBFS because of this. - -So we run the tests on all archs to see what breaks, but if it breaks we ignore -the result (exitcode 77 means: this test was skipped). - -Upstream-Status: Pending [from debian] -testsuite-ignore-elflint.diff and rebase to 0.172 - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - tests/run-elflint-self.sh | 2 +- - tests/test-subr.sh | 15 +++++++++++++++ - 2 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/tests/run-elflint-self.sh b/tests/run-elflint-self.sh -index 58fa7d0..85d21a5 100755 ---- a/tests/run-elflint-self.sh -+++ b/tests/run-elflint-self.sh -@@ -18,5 +18,5 @@ - - . $srcdir/test-subr.sh - --testrun_on_self ${abs_top_builddir}/src/elflint --quiet --gnu-ld -+testrun_on_self_skip ${abs_top_builddir}/src/elflint --quiet --gnu-ld - testrun_on_self_compressed ${abs_top_builddir}/src/elflint --quiet --gnu-ld -diff --git a/tests/test-subr.sh b/tests/test-subr.sh -index 09f428d..26f61f1 100644 ---- a/tests/test-subr.sh -+++ b/tests/test-subr.sh -@@ -201,3 +201,18 @@ testrun_on_self_quiet() - # Only exit if something failed - if test $exit_status != 0; then exit $exit_status; fi - } -+ -+# Same as testrun_on_self(), but skip on failure. -+testrun_on_self_skip() -+{ -+ exit_status=0 -+ -+ for file in $self_test_files; do -+ testrun $* $file \ -+ || { echo "*** failure in $* $file"; exit_status=77; } -+ done -+ -+ # Only exit if something failed -+ if test $exit_status != 0; then exit $exit_status; fi -+} -+ --- -2.7.4 - diff --git a/poky/meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch b/poky/meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch index 4bdb1ff3c..1ab704e67 100644 --- a/poky/meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch +++ b/poky/meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch @@ -1,12 +1,11 @@ -Upstream-Status: Pending [from debian] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - From fdaab18a65ed2529656baa64cb6169f34d7e507b Mon Sep 17 00:00:00 2001 From: James Cowgill <james410@cowgill.org.uk> Date: Mon, 5 Jan 2015 15:17:01 +0000 Subject: [PATCH 2/3] Add support for mips64 abis in mips_retval.c Signed-off-by: James Cowgill <james410@cowgill.org.uk> +Upstream-Status: Pending [from debian] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- backends/mips_retval.c | 104 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 94 insertions(+), 10 deletions(-) diff --git a/poky/meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch b/poky/meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch index d27ce6dc9..b196802bc 100644 --- a/poky/meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch +++ b/poky/meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch @@ -1,6 +1,3 @@ -Upstream-Status: Pending [from debian] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - From 59d4b8c48e5040af7e02b34eb26ea602ec82a38e Mon Sep 17 00:00:00 2001 From: James Cowgill <james410@cowgill.org.uk> Date: Mon, 5 Jan 2015 15:17:02 +0000 @@ -15,6 +12,8 @@ This patch also ensures that strip.c sets the correct value of e_machine before manipulating relocations so that these changes take effect. Signed-off-by: James Cowgill <james410@cowgill.org.uk> +Upstream-Status: Pending [from debian] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- libelf/gelf_getrel.c | 25 +++++++++++++++++++++++-- libelf/gelf_getrela.c | 25 +++++++++++++++++++++++-- @@ -23,10 +22,10 @@ Signed-off-by: James Cowgill <james410@cowgill.org.uk> src/strip.c | 17 +++++++++++++++++ 5 files changed, 101 insertions(+), 6 deletions(-) -Index: b/libelf/gelf_getrel.c +Index: elfutils-0.175/libelf/gelf_getrel.c =================================================================== ---- a/libelf/gelf_getrel.c -+++ b/libelf/gelf_getrel.c +--- elfutils-0.175.orig/libelf/gelf_getrel.c ++++ elfutils-0.175/libelf/gelf_getrel.c @@ -36,6 +36,7 @@ #include "libelfP.h" @@ -66,10 +65,10 @@ Index: b/libelf/gelf_getrel.c } rwlock_unlock (scn->elf->lock); -Index: b/libelf/gelf_getrela.c +Index: elfutils-0.175/libelf/gelf_getrela.c =================================================================== ---- a/libelf/gelf_getrela.c -+++ b/libelf/gelf_getrela.c +--- elfutils-0.175.orig/libelf/gelf_getrela.c ++++ elfutils-0.175/libelf/gelf_getrela.c @@ -36,6 +36,7 @@ #include "libelfP.h" @@ -109,10 +108,10 @@ Index: b/libelf/gelf_getrela.c } rwlock_unlock (scn->elf->lock); -Index: b/libelf/gelf_update_rel.c +Index: elfutils-0.175/libelf/gelf_update_rel.c =================================================================== ---- a/libelf/gelf_update_rel.c -+++ b/libelf/gelf_update_rel.c +--- elfutils-0.175.orig/libelf/gelf_update_rel.c ++++ elfutils-0.175/libelf/gelf_update_rel.c @@ -36,6 +36,7 @@ #include "libelfP.h" @@ -154,10 +153,10 @@ Index: b/libelf/gelf_update_rel.c } result = 1; -Index: b/libelf/gelf_update_rela.c +Index: elfutils-0.175/libelf/gelf_update_rela.c =================================================================== ---- a/libelf/gelf_update_rela.c -+++ b/libelf/gelf_update_rela.c +--- elfutils-0.175.orig/libelf/gelf_update_rela.c ++++ elfutils-0.175/libelf/gelf_update_rela.c @@ -36,6 +36,7 @@ #include "libelfP.h" @@ -199,11 +198,11 @@ Index: b/libelf/gelf_update_rela.c } result = 1; -Index: b/src/strip.c +Index: elfutils-0.175/src/strip.c =================================================================== ---- a/src/strip.c -+++ b/src/strip.c -@@ -598,6 +598,23 @@ handle_elf (int fd, Elf *elf, const char +--- elfutils-0.175.orig/src/strip.c ++++ elfutils-0.175/src/strip.c +@@ -1062,6 +1062,23 @@ handle_elf (int fd, Elf *elf, const char goto fail; } @@ -225,5 +224,5 @@ Index: b/src/strip.c + } + /* Copy over the old program header if needed. */ - if (ehdr->e_type != ET_REL) - for (cnt = 0; cnt < phnum; ++cnt) + if (phnum > 0) + { diff --git a/poky/meta/recipes-devtools/elfutils/files/debian/0001-arm_backend.patch b/poky/meta/recipes-devtools/elfutils/files/debian/arm_backend.diff index 4ed81194b..f7258a8d2 100644 --- a/poky/meta/recipes-devtools/elfutils/files/debian/0001-arm_backend.patch +++ b/poky/meta/recipes-devtools/elfutils/files/debian/arm_backend.diff @@ -1,30 +1,10 @@ -From a95f370bc2690c150c46f215543de278469900eb Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 29 Jun 2018 15:42:39 +0800 -Subject: [PATCH] arm_backend - Upstream-Status: Pending [from debian] -arm_backend.diff and rebase to 0.172 - -http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz - Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - backends/arm_init.c | 18 ++++- - backends/arm_regs.c | 132 ++++++++++++++++++++++++++++++++++++ - backends/arm_retval.c | 43 +++++++++++- - backends/libebl_arm.h | 9 +++ - libelf/elf.h | 11 +++ - tests/run-addrcfi.sh | 93 ++++++++++++++++++++++++- - tests/run-allregs.sh | 95 +++++++++++++++++++++++++- - tests/run-readelf-mixed-corenote.sh | 11 ++- - 8 files changed, 400 insertions(+), 12 deletions(-) - create mode 100644 backends/libebl_arm.h -diff --git a/backends/arm_init.c b/backends/arm_init.c -index f2b1b11..1b71f16 100644 ---- a/backends/arm_init.c -+++ b/backends/arm_init.c +Index: elfutils-0.175/backends/arm_init.c +=================================================================== +--- elfutils-0.175.orig/backends/arm_init.c ++++ elfutils-0.175/backends/arm_init.c @@ -35,20 +35,31 @@ #define RELOC_PREFIX R_ARM_ #include "libebl_CPU.h" @@ -58,7 +38,7 @@ index f2b1b11..1b71f16 100644 /* We handle it. */ eh->name = "ARM"; arm_init_reloc (eh); -@@ -60,7 +71,10 @@ arm_init (Elf *elf __attribute__ ((unused)), +@@ -60,7 +71,10 @@ arm_init (Elf *elf __attribute__ ((unuse HOOK (eh, core_note); HOOK (eh, auxv_info); HOOK (eh, check_object_attribute); @@ -70,10 +50,10 @@ index f2b1b11..1b71f16 100644 HOOK (eh, abi_cfi); HOOK (eh, check_reloc_target_type); HOOK (eh, symbol_type_name); -diff --git a/backends/arm_regs.c b/backends/arm_regs.c -index a46a4c9..418c931 100644 ---- a/backends/arm_regs.c -+++ b/backends/arm_regs.c +Index: elfutils-0.175/backends/arm_regs.c +=================================================================== +--- elfutils-0.175.orig/backends/arm_regs.c ++++ elfutils-0.175/backends/arm_regs.c @@ -31,6 +31,7 @@ #endif @@ -82,7 +62,7 @@ index a46a4c9..418c931 100644 #include <dwarf.h> #define BACKEND arm_ -@@ -76,6 +77,9 @@ arm_register_info (Ebl *ebl __attribute__ ((unused)), +@@ -76,6 +77,9 @@ arm_register_info (Ebl *ebl __attribute_ break; case 16 + 0 ... 16 + 7: @@ -92,7 +72,7 @@ index a46a4c9..418c931 100644 regno += 96 - 16; FALLTHROUGH; case 96 + 0 ... 96 + 7: -@@ -87,11 +91,139 @@ arm_register_info (Ebl *ebl __attribute__ ((unused)), +@@ -87,11 +91,139 @@ arm_register_info (Ebl *ebl __attribute_ namelen = 2; break; @@ -232,10 +212,10 @@ index a46a4c9..418c931 100644 *setname = "VFP"; *type = DW_ATE_float; *bits = 64; -diff --git a/backends/arm_retval.c b/backends/arm_retval.c -index 1c28f01..313e4eb 100644 ---- a/backends/arm_retval.c -+++ b/backends/arm_retval.c +Index: elfutils-0.175/backends/arm_retval.c +=================================================================== +--- elfutils-0.175.orig/backends/arm_retval.c ++++ elfutils-0.175/backends/arm_retval.c @@ -48,6 +48,13 @@ static const Dwarf_Op loc_intreg[] = #define nloc_intreg 1 #define nloc_intregs(n) (2 * (n)) @@ -262,7 +242,7 @@ index 1c28f01..313e4eb 100644 { /* Start with the function's type, and get the DW_AT_type attribute, which is the type of the return value. */ -@@ -98,6 +106,21 @@ arm_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp) +@@ -98,6 +106,21 @@ arm_return_value_location (Dwarf_Die *fu else return -1; } @@ -284,7 +264,7 @@ index 1c28f01..313e4eb 100644 if (size <= 16) { intreg: -@@ -106,6 +129,7 @@ arm_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp) +@@ -106,6 +129,7 @@ arm_return_value_location (Dwarf_Die *fu } aggregate: @@ -292,7 +272,7 @@ index 1c28f01..313e4eb 100644 *locp = loc_aggregate; return nloc_aggregate; } -@@ -125,3 +149,18 @@ arm_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp) +@@ -125,3 +149,18 @@ arm_return_value_location (Dwarf_Die *fu DWARF and might be valid. */ return -2; } @@ -311,26 +291,11 @@ index 1c28f01..313e4eb 100644 + return arm_return_value_location_ (functypedie, locp, 0); +} + -diff --git a/backends/libebl_arm.h b/backends/libebl_arm.h -new file mode 100644 -index 0000000..c00770c ---- /dev/null -+++ b/backends/libebl_arm.h -@@ -0,0 +1,9 @@ -+#ifndef _LIBEBL_ARM_H -+#define _LIBEBL_ARM_H 1 -+ -+#include <libdw.h> -+ -+extern int arm_return_value_location_soft(Dwarf_Die *, const Dwarf_Op **locp); -+extern int arm_return_value_location_hard(Dwarf_Die *, const Dwarf_Op **locp); -+ -+#endif -diff --git a/libelf/elf.h b/libelf/elf.h -index 6c9f61e..6d82fef 100644 ---- a/libelf/elf.h -+++ b/libelf/elf.h -@@ -2692,6 +2692,9 @@ enum +Index: elfutils-0.175/libelf/elf.h +=================================================================== +--- elfutils-0.175.orig/libelf/elf.h ++++ elfutils-0.175/libelf/elf.h +@@ -2694,6 +2694,9 @@ enum #define EF_ARM_EABI_VER4 0x04000000 #define EF_ARM_EABI_VER5 0x05000000 @@ -340,7 +305,7 @@ index 6c9f61e..6d82fef 100644 /* Additional symbol types for Thumb. */ #define STT_ARM_TFUNC STT_LOPROC /* A Thumb function. */ #define STT_ARM_16BIT STT_HIPROC /* A Thumb label. */ -@@ -2709,12 +2712,19 @@ enum +@@ -2711,12 +2714,19 @@ enum /* Processor specific values for the Phdr p_type field. */ #define PT_ARM_EXIDX (PT_LOPROC + 1) /* ARM unwind segment. */ @@ -360,7 +325,7 @@ index 6c9f61e..6d82fef 100644 /* AArch64 relocs. */ -@@ -3007,6 +3017,7 @@ enum +@@ -3009,6 +3019,7 @@ enum TLS block (LDR, STR). */ #define R_ARM_TLS_IE12GP 111 /* 12 bit GOT entry relative to GOT origin (LDR). */ @@ -368,121 +333,24 @@ index 6c9f61e..6d82fef 100644 #define R_ARM_ME_TOO 128 /* Obsolete. */ #define R_ARM_THM_TLS_DESCSEQ 129 #define R_ARM_THM_TLS_DESCSEQ16 129 -diff --git a/tests/run-addrcfi.sh b/tests/run-addrcfi.sh -index fd89d02..462d7c5 100755 ---- a/tests/run-addrcfi.sh -+++ b/tests/run-addrcfi.sh -@@ -3554,6 +3554,38 @@ dwarf_cfi_addrframe (.eh_frame): no matching address range - FPA reg21 (f5): undefined - FPA reg22 (f6): undefined - FPA reg23 (f7): undefined -+ VFP reg64 (s0): undefined -+ VFP reg65 (s1): undefined -+ VFP reg66 (s2): undefined -+ VFP reg67 (s3): undefined -+ VFP reg68 (s4): undefined -+ VFP reg69 (s5): undefined -+ VFP reg70 (s6): undefined -+ VFP reg71 (s7): undefined -+ VFP reg72 (s8): undefined -+ VFP reg73 (s9): undefined -+ VFP reg74 (s10): undefined -+ VFP reg75 (s11): undefined -+ VFP reg76 (s12): undefined -+ VFP reg77 (s13): undefined -+ VFP reg78 (s14): undefined -+ VFP reg79 (s15): undefined -+ VFP reg80 (s16): undefined -+ VFP reg81 (s17): undefined -+ VFP reg82 (s18): undefined -+ VFP reg83 (s19): undefined -+ VFP reg84 (s20): undefined -+ VFP reg85 (s21): undefined -+ VFP reg86 (s22): undefined -+ VFP reg87 (s23): undefined -+ VFP reg88 (s24): undefined -+ VFP reg89 (s25): undefined -+ VFP reg90 (s26): undefined -+ VFP reg91 (s27): undefined -+ VFP reg92 (s28): undefined -+ VFP reg93 (s29): undefined -+ VFP reg94 (s30): undefined -+ VFP reg95 (s31): undefined - FPA reg96 (f0): undefined - FPA reg97 (f1): undefined - FPA reg98 (f2): undefined -@@ -3562,7 +3594,66 @@ dwarf_cfi_addrframe (.eh_frame): no matching address range - FPA reg101 (f5): undefined - FPA reg102 (f6): undefined - FPA reg103 (f7): undefined -- integer reg128 (spsr): undefined -+ MMX reg104 (wcgr0): undefined -+ MMX reg105 (wcgr1): undefined -+ MMX reg106 (wcgr2): undefined -+ MMX reg107 (wcgr3): undefined -+ MMX reg108 (wcgr4): undefined -+ MMX reg109 (wcgr5): undefined -+ MMX reg110 (wcgr6): undefined -+ MMX reg111 (wcgr7): undefined -+ MMX reg112 (wr0): undefined -+ MMX reg113 (wr1): undefined -+ MMX reg114 (wr2): undefined -+ MMX reg115 (wr3): undefined -+ MMX reg116 (wr4): undefined -+ MMX reg117 (wr5): undefined -+ MMX reg118 (wr6): undefined -+ MMX reg119 (wr7): undefined -+ MMX reg120 (wr8): undefined -+ MMX reg121 (wr9): undefined -+ MMX reg122 (wr10): undefined -+ MMX reg123 (wr11): undefined -+ MMX reg124 (wr12): undefined -+ MMX reg125 (wr13): undefined -+ MMX reg126 (wr14): undefined -+ MMX reg127 (wr15): undefined -+ state reg128 (spsr): undefined -+ state reg129 (spsr_fiq): undefined -+ state reg130 (spsr_irq): undefined -+ state reg131 (spsr_abt): undefined -+ state reg132 (spsr_und): undefined -+ state reg133 (spsr_svc): undefined -+ integer reg144 (r8_usr): undefined -+ integer reg145 (r9_usr): undefined -+ integer reg146 (r10_usr): undefined -+ integer reg147 (r11_usr): undefined -+ integer reg148 (r12_usr): undefined -+ integer reg149 (r13_usr): undefined -+ integer reg150 (r14_usr): undefined -+ integer reg151 (r8_fiq): undefined -+ integer reg152 (r9_fiq): undefined -+ integer reg153 (r10_fiq): undefined -+ integer reg154 (r11_fiq): undefined -+ integer reg155 (r12_fiq): undefined -+ integer reg156 (r13_fiq): undefined -+ integer reg157 (r14_fiq): undefined -+ integer reg158 (r13_irq): undefined -+ integer reg159 (r14_irq): undefined -+ integer reg160 (r13_abt): undefined -+ integer reg161 (r14_abt): undefined -+ integer reg162 (r13_und): undefined -+ integer reg163 (r14_und): undefined -+ integer reg164 (r13_svc): undefined -+ integer reg165 (r14_svc): undefined -+ MMX reg192 (wc0): undefined -+ MMX reg193 (wc1): undefined -+ MMX reg194 (wc2): undefined -+ MMX reg195 (wc3): undefined -+ MMX reg196 (wc4): undefined -+ MMX reg197 (wc5): undefined -+ MMX reg198 (wc6): undefined -+ MMX reg199 (wc7): undefined - VFP reg256 (d0): undefined - VFP reg257 (d1): undefined - VFP reg258 (d2): undefined -diff --git a/tests/run-allregs.sh b/tests/run-allregs.sh -index 7ddd452..a31dba4 100755 ---- a/tests/run-allregs.sh -+++ b/tests/run-allregs.sh +Index: elfutils-0.175/backends/libebl_arm.h +=================================================================== +--- /dev/null ++++ elfutils-0.175/backends/libebl_arm.h +@@ -0,0 +1,9 @@ ++#ifndef _LIBEBL_ARM_H ++#define _LIBEBL_ARM_H 1 ++ ++#include <libdw.h> ++ ++extern int arm_return_value_location_soft(Dwarf_Die *, const Dwarf_Op **locp); ++extern int arm_return_value_location_hard(Dwarf_Die *, const Dwarf_Op **locp); ++ ++#endif +Index: elfutils-0.175/tests/run-allregs.sh +=================================================================== +--- elfutils-0.175.orig/tests/run-allregs.sh ++++ elfutils-0.175/tests/run-allregs.sh @@ -2672,7 +2672,28 @@ integer registers: 13: sp (sp), address 32 bits 14: lr (lr), address 32 bits @@ -600,11 +468,11 @@ index 7ddd452..a31dba4 100755 EOF # See run-readelf-mixed-corenote.sh for instructions to regenerate -diff --git a/tests/run-readelf-mixed-corenote.sh b/tests/run-readelf-mixed-corenote.sh -index 86171c4..018612f 100755 ---- a/tests/run-readelf-mixed-corenote.sh -+++ b/tests/run-readelf-mixed-corenote.sh -@@ -31,12 +31,11 @@ Note segment of 892 bytes at offset 0x274: +Index: elfutils-0.175/tests/run-readelf-mixed-corenote.sh +=================================================================== +--- elfutils-0.175.orig/tests/run-readelf-mixed-corenote.sh ++++ elfutils-0.175/tests/run-readelf-mixed-corenote.sh +@@ -31,12 +31,11 @@ Note segment of 892 bytes at offset 0x27 pid: 11087, ppid: 11063, pgrp: 11087, sid: 11063 utime: 0.000000, stime: 0.010000, cutime: 0.000000, cstime: 0.000000 orig_r0: -1, fpvalid: 1 @@ -622,6 +490,114 @@ index 86171c4..018612f 100755 CORE 124 PRPSINFO state: 0, sname: R, zomb: 0, nice: 0, flag: 0x00400500 uid: 0, gid: 0, pid: 11087, ppid: 11063, pgrp: 11087, sid: 11063 --- -2.7.4 - +Index: elfutils-0.175/tests/run-addrcfi.sh +=================================================================== +--- elfutils-0.175.orig/tests/run-addrcfi.sh ++++ elfutils-0.175/tests/run-addrcfi.sh +@@ -3554,6 +3554,38 @@ dwarf_cfi_addrframe (.eh_frame): no matc + FPA reg21 (f5): undefined + FPA reg22 (f6): undefined + FPA reg23 (f7): undefined ++ VFP reg64 (s0): undefined ++ VFP reg65 (s1): undefined ++ VFP reg66 (s2): undefined ++ VFP reg67 (s3): undefined ++ VFP reg68 (s4): undefined ++ VFP reg69 (s5): undefined ++ VFP reg70 (s6): undefined ++ VFP reg71 (s7): undefined ++ VFP reg72 (s8): undefined ++ VFP reg73 (s9): undefined ++ VFP reg74 (s10): undefined ++ VFP reg75 (s11): undefined ++ VFP reg76 (s12): undefined ++ VFP reg77 (s13): undefined ++ VFP reg78 (s14): undefined ++ VFP reg79 (s15): undefined ++ VFP reg80 (s16): undefined ++ VFP reg81 (s17): undefined ++ VFP reg82 (s18): undefined ++ VFP reg83 (s19): undefined ++ VFP reg84 (s20): undefined ++ VFP reg85 (s21): undefined ++ VFP reg86 (s22): undefined ++ VFP reg87 (s23): undefined ++ VFP reg88 (s24): undefined ++ VFP reg89 (s25): undefined ++ VFP reg90 (s26): undefined ++ VFP reg91 (s27): undefined ++ VFP reg92 (s28): undefined ++ VFP reg93 (s29): undefined ++ VFP reg94 (s30): undefined ++ VFP reg95 (s31): undefined + FPA reg96 (f0): undefined + FPA reg97 (f1): undefined + FPA reg98 (f2): undefined +@@ -3562,7 +3594,66 @@ dwarf_cfi_addrframe (.eh_frame): no matc + FPA reg101 (f5): undefined + FPA reg102 (f6): undefined + FPA reg103 (f7): undefined +- integer reg128 (spsr): undefined ++ MMX reg104 (wcgr0): undefined ++ MMX reg105 (wcgr1): undefined ++ MMX reg106 (wcgr2): undefined ++ MMX reg107 (wcgr3): undefined ++ MMX reg108 (wcgr4): undefined ++ MMX reg109 (wcgr5): undefined ++ MMX reg110 (wcgr6): undefined ++ MMX reg111 (wcgr7): undefined ++ MMX reg112 (wr0): undefined ++ MMX reg113 (wr1): undefined ++ MMX reg114 (wr2): undefined ++ MMX reg115 (wr3): undefined ++ MMX reg116 (wr4): undefined ++ MMX reg117 (wr5): undefined ++ MMX reg118 (wr6): undefined ++ MMX reg119 (wr7): undefined ++ MMX reg120 (wr8): undefined ++ MMX reg121 (wr9): undefined ++ MMX reg122 (wr10): undefined ++ MMX reg123 (wr11): undefined ++ MMX reg124 (wr12): undefined ++ MMX reg125 (wr13): undefined ++ MMX reg126 (wr14): undefined ++ MMX reg127 (wr15): undefined ++ state reg128 (spsr): undefined ++ state reg129 (spsr_fiq): undefined ++ state reg130 (spsr_irq): undefined ++ state reg131 (spsr_abt): undefined ++ state reg132 (spsr_und): undefined ++ state reg133 (spsr_svc): undefined ++ integer reg144 (r8_usr): undefined ++ integer reg145 (r9_usr): undefined ++ integer reg146 (r10_usr): undefined ++ integer reg147 (r11_usr): undefined ++ integer reg148 (r12_usr): undefined ++ integer reg149 (r13_usr): undefined ++ integer reg150 (r14_usr): undefined ++ integer reg151 (r8_fiq): undefined ++ integer reg152 (r9_fiq): undefined ++ integer reg153 (r10_fiq): undefined ++ integer reg154 (r11_fiq): undefined ++ integer reg155 (r12_fiq): undefined ++ integer reg156 (r13_fiq): undefined ++ integer reg157 (r14_fiq): undefined ++ integer reg158 (r13_irq): undefined ++ integer reg159 (r14_irq): undefined ++ integer reg160 (r13_abt): undefined ++ integer reg161 (r14_abt): undefined ++ integer reg162 (r13_und): undefined ++ integer reg163 (r14_und): undefined ++ integer reg164 (r13_svc): undefined ++ integer reg165 (r14_svc): undefined ++ MMX reg192 (wc0): undefined ++ MMX reg193 (wc1): undefined ++ MMX reg194 (wc2): undefined ++ MMX reg195 (wc3): undefined ++ MMX reg196 (wc4): undefined ++ MMX reg197 (wc5): undefined ++ MMX reg198 (wc6): undefined ++ MMX reg199 (wc7): undefined + VFP reg256 (d0): undefined + VFP reg257 (d1): undefined + VFP reg258 (d2): undefined diff --git a/poky/meta/recipes-devtools/elfutils/files/debian/disable_werror.patch b/poky/meta/recipes-devtools/elfutils/files/debian/disable_werror.patch new file mode 100644 index 000000000..75736bff0 --- /dev/null +++ b/poky/meta/recipes-devtools/elfutils/files/debian/disable_werror.patch @@ -0,0 +1,20 @@ +From: Helmut Grohne <helmut@subdivi.de> +Subject: disable -Werror as it tends to break with new gcc versions +Bug-Debian: https://bugs.debian.org/886004 +Last-Update: 2018-01-01 + +Upstream-Status: Pending [from debian] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +Index: elfutils-0.175/config/eu.am +=================================================================== +--- elfutils-0.175.orig/config/eu.am ++++ elfutils-0.175/config/eu.am +@@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -W + -Wold-style-definition -Wstrict-prototypes \ + $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ + $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ +- $(if $($(*F)_no_Werror),,-Werror) \ + $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ + $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ + $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \ diff --git a/poky/meta/recipes-devtools/elfutils/files/debian/0001-hppa_backend.patch b/poky/meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff index 2c5d4fa4b..105e3f430 100644 --- a/poky/meta/recipes-devtools/elfutils/files/debian/0001-hppa_backend.patch +++ b/poky/meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff @@ -1,84 +1,10 @@ -From c510c6c8523246dd79c6ea28d1646b153c23e491 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 29 Jun 2018 15:39:46 +0800 -Subject: [PATCH] hppa_backend - Upstream-Status: Pending [from debian] -hppa_backend.diff and rebase to 0.172 - -http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - backends/Makefile.am | 9 +- - backends/libebl_parisc.h | 9 ++ - backends/parisc_init.c | 73 ++++++++++++++++ - backends/parisc_regs.c | 159 ++++++++++++++++++++++++++++++++++ - backends/parisc_reloc.def | 128 ++++++++++++++++++++++++++++ - backends/parisc_retval.c | 213 ++++++++++++++++++++++++++++++++++++++++++++++ - backends/parisc_symbol.c | 112 ++++++++++++++++++++++++ - libelf/elf.h | 11 +++ - 8 files changed, 711 insertions(+), 3 deletions(-) - create mode 100644 backends/libebl_parisc.h - create mode 100644 backends/parisc_init.c - create mode 100644 backends/parisc_regs.c - create mode 100644 backends/parisc_reloc.def - create mode 100644 backends/parisc_retval.c - create mode 100644 backends/parisc_symbol.c -diff --git a/backends/Makefile.am b/backends/Makefile.am -index 80aa00e..1e4b8e9 100644 ---- a/backends/Makefile.am -+++ b/backends/Makefile.am -@@ -33,16 +33,16 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \ - - - modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \ -- tilegx m68k bpf riscv -+ tilegx m68k bpf riscv parisc - libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \ - libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \ - libebl_aarch64_pic.a libebl_sparc_pic.a libebl_ppc_pic.a \ - libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a \ -- libebl_m68k_pic.a libebl_bpf_pic.a libebl_riscv_pic.a -+ libebl_m68k_pic.a libebl_bpf_pic.a libebl_riscv_pic.a \ -+ libebl_parisc_pic.a - noinst_LIBRARIES = $(libebl_pic) - noinst_DATA = $(libebl_pic:_pic.a=.so) - -- - libelf = ../libelf/libelf.so - libdw = ../libdw/libdw.so - libeu = ../lib/libeu.a -@@ -135,6 +135,9 @@ riscv_SRCS = riscv_init.c riscv_symbol.c - libebl_riscv_pic_a_SOURCES = $(riscv_SRCS) - am_libebl_riscv_pic_a_OBJECTS = $(riscv_SRCS:.c=.os) - -+parisc_SRCS = parisc_init.c parisc_symbol.c parisc_regs.c parisc_retval.c -+libebl_parisc_pic_a_SOURCES = $(parisc_SRCS) -+am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os) - - libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) $(libeu) - @rm -f $(@:.so=.map) -diff --git a/backends/libebl_parisc.h b/backends/libebl_parisc.h -new file mode 100644 -index 0000000..f473b79 ---- /dev/null -+++ b/backends/libebl_parisc.h -@@ -0,0 +1,9 @@ -+#ifndef _LIBEBL_HPPA_H -+#define _LIBEBL_HPPA_H 1 -+ -+#include <libdw.h> -+ -+extern int parisc_return_value_location_32(Dwarf_Die *, const Dwarf_Op **locp); -+extern int parisc_return_value_location_64(Dwarf_Die *, const Dwarf_Op **locp); -+ -+#endif -diff --git a/backends/parisc_init.c b/backends/parisc_init.c -new file mode 100644 -index 0000000..f1e401c +Index: elfutils-0.175/backends/parisc_init.c +=================================================================== --- /dev/null -+++ b/backends/parisc_init.c ++++ elfutils-0.175/backends/parisc_init.c @@ -0,0 +1,73 @@ +/* Initialization of PA-RISC specific backend library. + Copyright (C) 2002, 2005, 2006 Red Hat, Inc. @@ -153,11 +79,10 @@ index 0000000..f1e401c + + return MODVERSION; +} -diff --git a/backends/parisc_regs.c b/backends/parisc_regs.c -new file mode 100644 -index 0000000..3895f8e +Index: elfutils-0.175/backends/parisc_regs.c +=================================================================== --- /dev/null -+++ b/backends/parisc_regs.c ++++ elfutils-0.175/backends/parisc_regs.c @@ -0,0 +1,159 @@ +/* Register names and numbers for PA-RISC DWARF. + Copyright (C) 2005, 2006 Red Hat, Inc. @@ -318,11 +243,10 @@ index 0000000..3895f8e + name[namelen++] = '\0'; + return namelen; +} -diff --git a/backends/parisc_reloc.def b/backends/parisc_reloc.def -new file mode 100644 -index 0000000..1f875ba +Index: elfutils-0.175/backends/parisc_reloc.def +=================================================================== --- /dev/null -+++ b/backends/parisc_reloc.def ++++ elfutils-0.175/backends/parisc_reloc.def @@ -0,0 +1,128 @@ +/* List the relocation types for PA-RISC. -*- C -*- + Copyright (C) 2005 Red Hat, Inc. @@ -452,11 +376,10 @@ index 0000000..1f875ba +RELOC_TYPE (TLS_DTPMOD64, DYN) + +#define NO_RELATIVE_RELOC 1 -diff --git a/backends/parisc_retval.c b/backends/parisc_retval.c -new file mode 100644 -index 0000000..df7ec3a +Index: elfutils-0.175/backends/parisc_retval.c +=================================================================== --- /dev/null -+++ b/backends/parisc_retval.c ++++ elfutils-0.175/backends/parisc_retval.c @@ -0,0 +1,213 @@ +/* Function return value location for Linux/PA-RISC ABI. + Copyright (C) 2005 Red Hat, Inc. @@ -671,12 +594,11 @@ index 0000000..df7ec3a + return parisc_return_value_location_ (functypedie, locp, 1); +} + -diff --git a/backends/parisc_symbol.c b/backends/parisc_symbol.c -new file mode 100644 -index 0000000..d111a76 +Index: elfutils-0.175/backends/parisc_symbol.c +=================================================================== --- /dev/null -+++ b/backends/parisc_symbol.c -@@ -0,0 +1,112 @@ ++++ elfutils-0.175/backends/parisc_symbol.c +@@ -0,0 +1,113 @@ +/* PA-RISC specific symbolic name handling. + Copyright (C) 2002, 2005 Red Hat, Inc. + This file is part of Red Hat elfutils. @@ -775,7 +697,8 @@ index 0000000..d111a76 + +/* Check for the simple reloc types. */ +Elf_Type -+parisc_reloc_simple_type (Ebl *ebl __attribute__ ((unused)), int type) ++parisc_reloc_simple_type (Ebl *ebl __attribute__ ((unused)), int type, ++ int *addsub __attribute__ ((unused))) +{ + switch (type) + { @@ -789,11 +712,55 @@ index 0000000..d111a76 + return ELF_T_NUM; + } +} -diff --git a/libelf/elf.h b/libelf/elf.h -index f774898..6c9f61e 100644 ---- a/libelf/elf.h -+++ b/libelf/elf.h -@@ -2153,16 +2153,24 @@ enum +Index: elfutils-0.175/backends/libebl_parisc.h +=================================================================== +--- /dev/null ++++ elfutils-0.175/backends/libebl_parisc.h +@@ -0,0 +1,9 @@ ++#ifndef _LIBEBL_HPPA_H ++#define _LIBEBL_HPPA_H 1 ++ ++#include <libdw.h> ++ ++extern int parisc_return_value_location_32(Dwarf_Die *, const Dwarf_Op **locp); ++extern int parisc_return_value_location_64(Dwarf_Die *, const Dwarf_Op **locp); ++ ++#endif +Index: elfutils-0.175/backends/Makefile.am +=================================================================== +--- elfutils-0.175.orig/backends/Makefile.am ++++ elfutils-0.175/backends/Makefile.am +@@ -33,12 +33,13 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I + + + modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \ +- tilegx m68k bpf riscv ++ tilegx m68k bpf riscv parisc + libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \ + libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \ + libebl_aarch64_pic.a libebl_sparc_pic.a libebl_ppc_pic.a \ + libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a \ +- libebl_m68k_pic.a libebl_bpf_pic.a libebl_riscv_pic.a ++ libebl_m68k_pic.a libebl_bpf_pic.a libebl_riscv_pic.a \ ++ libebl_parisc_pic.a + noinst_LIBRARIES = $(libebl_pic) + noinst_DATA = $(libebl_pic:_pic.a=.so) + +@@ -136,6 +137,9 @@ riscv_SRCS = riscv_init.c riscv_symbol.c + libebl_riscv_pic_a_SOURCES = $(riscv_SRCS) + am_libebl_riscv_pic_a_OBJECTS = $(riscv_SRCS:.c=.os) + ++parisc_SRCS = parisc_init.c parisc_symbol.c parisc_regs.c parisc_retval.c ++libebl_parisc_pic_a_SOURCES = $(parisc_SRCS) ++am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os) + + libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) $(libeu) + @rm -f $(@:.so=.map) +Index: elfutils-0.175/libelf/elf.h +=================================================================== +--- elfutils-0.175.orig/libelf/elf.h ++++ elfutils-0.175/libelf/elf.h +@@ -2155,16 +2155,24 @@ enum #define R_PARISC_PCREL17F 12 /* 17 bits of rel. address. */ #define R_PARISC_PCREL14R 14 /* Right 14 bits of rel. address. */ #define R_PARISC_DPREL21L 18 /* Left 21 bits of rel. address. */ @@ -818,7 +785,7 @@ index f774898..6c9f61e 100644 #define R_PARISC_LTOFF_FPTR32 57 /* 32 bits LT-rel. function pointer. */ #define R_PARISC_LTOFF_FPTR21L 58 /* LT-rel. fct ptr, left 21 bits. */ #define R_PARISC_LTOFF_FPTR14R 62 /* LT-rel. fct ptr, right 14 bits. */ -@@ -2171,6 +2179,7 @@ enum +@@ -2173,6 +2181,7 @@ enum #define R_PARISC_PLABEL21L 66 /* Left 21 bits of fdesc address. */ #define R_PARISC_PLABEL14R 70 /* Right 14 bits of fdesc address. */ #define R_PARISC_PCREL64 72 /* 64 bits PC-rel. address. */ @@ -826,7 +793,7 @@ index f774898..6c9f61e 100644 #define R_PARISC_PCREL22F 74 /* 22 bits PC-rel. address. */ #define R_PARISC_PCREL14WR 75 /* PC-rel. address, right 14 bits. */ #define R_PARISC_PCREL14DR 76 /* PC rel. address, right 14 bits. */ -@@ -2196,6 +2205,8 @@ enum +@@ -2198,6 +2207,8 @@ enum #define R_PARISC_LTOFF16WF 102 /* 16 bits LT-rel. address. */ #define R_PARISC_LTOFF16DF 103 /* 16 bits LT-rel. address. */ #define R_PARISC_SECREL64 104 /* 64 bits section rel. address. */ @@ -835,6 +802,3 @@ index f774898..6c9f61e 100644 #define R_PARISC_SEGREL64 112 /* 64 bits segment rel. address. */ #define R_PARISC_PLTOFF14WR 115 /* PLT-rel. address, right 14 bits. */ #define R_PARISC_PLTOFF14DR 116 /* PLT-rel. address, right 14 bits. */ --- -2.7.4 - diff --git a/poky/meta/recipes-devtools/elfutils/files/debian/hurd_path.patch b/poky/meta/recipes-devtools/elfutils/files/debian/hurd_path.patch new file mode 100644 index 000000000..8fa35a452 --- /dev/null +++ b/poky/meta/recipes-devtools/elfutils/files/debian/hurd_path.patch @@ -0,0 +1,16 @@ +Upstream-Status: Pending [from debian] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Index: elfutils-0.165/tests/run-native-test.sh +=================================================================== +--- elfutils-0.165.orig/tests/run-native-test.sh ++++ elfutils-0.165/tests/run-native-test.sh +@@ -83,6 +83,9 @@ native_test() + # "cannot attach to process: Function not implemented". + [ "$(uname)" = "GNU/kFreeBSD" ] && exit 77 + ++# hurd's /proc/$PID/maps does not give paths yet. ++[ "$(uname)" = "GNU" ] && exit 77 ++ + native_test ${abs_builddir}/allregs + native_test ${abs_builddir}/funcretval + diff --git a/poky/meta/recipes-devtools/elfutils/files/debian/kfreebsd_path.patch b/poky/meta/recipes-devtools/elfutils/files/debian/kfreebsd_path.patch new file mode 100644 index 000000000..fe5159f3c --- /dev/null +++ b/poky/meta/recipes-devtools/elfutils/files/debian/kfreebsd_path.patch @@ -0,0 +1,19 @@ +Upstream-Status: Pending [from debian] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Index: b/tests/run-native-test.sh +=================================================================== +--- a/tests/run-native-test.sh ++++ b/tests/run-native-test.sh +@@ -77,6 +77,12 @@ native_test() + test $native -eq 0 || testrun "$@" -p $native > /dev/null + } + ++# On the Debian buildds, GNU/kFreeBSD linprocfs /proc/$PID/maps does ++# not give absolute paths due to sbuild's bind mounts (bug #570805) ++# therefore the next two test programs are expected to fail with ++# "cannot attach to process: Function not implemented". ++[ "$(uname)" = "GNU/kFreeBSD" ] && exit 77 ++ + native_test ${abs_builddir}/allregs + native_test ${abs_builddir}/funcretval + diff --git a/poky/meta/recipes-devtools/elfutils/files/debian/0001-mips_backend.patch b/poky/meta/recipes-devtools/elfutils/files/debian/mips_backend.diff index d04da72cc..998fa04dc 100644 --- a/poky/meta/recipes-devtools/elfutils/files/debian/0001-mips_backend.patch +++ b/poky/meta/recipes-devtools/elfutils/files/debian/mips_backend.diff @@ -1,65 +1,9 @@ -From 59ffb86bda845a68d3686afa7bc784131df678f7 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 29 Jun 2018 15:45:58 +0800 -Subject: [PATCH] mips_backend - Upstream-Status: Pending [from debian] -mips_backend.diff and rebase to 0.172 - -http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz - Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - backends/Makefile.am | 8 +- - backends/mips_init.c | 59 +++++++++ - backends/mips_regs.c | 104 ++++++++++++++++ - backends/mips_reloc.def | 79 ++++++++++++ - backends/mips_retval.c | 321 ++++++++++++++++++++++++++++++++++++++++++++++++ - backends/mips_symbol.c | 52 ++++++++ - libebl/eblopenbackend.c | 2 + - 7 files changed, 623 insertions(+), 2 deletions(-) - create mode 100644 backends/mips_init.c - create mode 100644 backends/mips_regs.c - create mode 100644 backends/mips_reloc.def - create mode 100644 backends/mips_retval.c - create mode 100644 backends/mips_symbol.c - -diff --git a/backends/Makefile.am b/backends/Makefile.am -index 1e4b8e9..e7bccf8 100644 ---- a/backends/Makefile.am -+++ b/backends/Makefile.am -@@ -33,13 +33,13 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \ - - - modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \ -- tilegx m68k bpf riscv parisc -+ tilegx m68k bpf riscv parisc mips - libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \ - libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \ - libebl_aarch64_pic.a libebl_sparc_pic.a libebl_ppc_pic.a \ - libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a \ - libebl_m68k_pic.a libebl_bpf_pic.a libebl_riscv_pic.a \ -- libebl_parisc_pic.a -+ libebl_parisc_pic.a libebl_mips_pic.a - noinst_LIBRARIES = $(libebl_pic) - noinst_DATA = $(libebl_pic:_pic.a=.so) - -@@ -139,6 +139,10 @@ parisc_SRCS = parisc_init.c parisc_symbol.c parisc_regs.c parisc_retval.c - libebl_parisc_pic_a_SOURCES = $(parisc_SRCS) - am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os) - -+mips_SRCS = mips_init.c mips_symbol.c mips_regs.c mips_retval.c -+libebl_mips_pic_a_SOURCES = $(mips_SRCS) -+am_libebl_mips_pic_a_OBJECTS = $(mips_SRCS:.c=.os) -+ - libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) $(libeu) - @rm -f $(@:.so=.map) - $(AM_V_at)echo 'ELFUTILS_$(PACKAGE_VERSION) { global: $*_init; local: *; };' \ -diff --git a/backends/mips_init.c b/backends/mips_init.c -new file mode 100644 -index 0000000..975c04e +Index: elfutils-0.175/backends/mips_init.c +=================================================================== --- /dev/null -+++ b/backends/mips_init.c ++++ elfutils-0.175/backends/mips_init.c @@ -0,0 +1,59 @@ +/* Initialization of mips specific backend library. + Copyright (C) 2006 Red Hat, Inc. @@ -120,11 +64,10 @@ index 0000000..975c04e + + return MODVERSION; +} -diff --git a/backends/mips_regs.c b/backends/mips_regs.c -new file mode 100644 -index 0000000..44f86cb +Index: elfutils-0.175/backends/mips_regs.c +=================================================================== --- /dev/null -+++ b/backends/mips_regs.c ++++ elfutils-0.175/backends/mips_regs.c @@ -0,0 +1,104 @@ +/* Register names and numbers for MIPS DWARF. + Copyright (C) 2006 Red Hat, Inc. @@ -230,11 +173,10 @@ index 0000000..44f86cb + name[namelen++] = '\0'; + return namelen; +} -diff --git a/backends/mips_reloc.def b/backends/mips_reloc.def -new file mode 100644 -index 0000000..4579970 +Index: elfutils-0.175/backends/mips_reloc.def +=================================================================== --- /dev/null -+++ b/backends/mips_reloc.def ++++ elfutils-0.175/backends/mips_reloc.def @@ -0,0 +1,79 @@ +/* List the relocation types for mips. -*- C -*- + Copyright (C) 2006 Red Hat, Inc. @@ -315,11 +257,10 @@ index 0000000..4579970 + +#define NO_COPY_RELOC 1 +#define NO_RELATIVE_RELOC 1 -diff --git a/backends/mips_retval.c b/backends/mips_retval.c -new file mode 100644 -index 0000000..656cd1f +Index: elfutils-0.175/backends/mips_retval.c +=================================================================== --- /dev/null -+++ b/backends/mips_retval.c ++++ elfutils-0.175/backends/mips_retval.c @@ -0,0 +1,321 @@ +/* Function return value location for Linux/mips ABI. + Copyright (C) 2005 Red Hat, Inc. @@ -642,12 +583,11 @@ index 0000000..656cd1f + DWARF and might be valid. */ + return -2; +} -diff --git a/backends/mips_symbol.c b/backends/mips_symbol.c -new file mode 100644 -index 0000000..ba465fe +Index: elfutils-0.175/backends/mips_symbol.c +=================================================================== --- /dev/null -+++ b/backends/mips_symbol.c -@@ -0,0 +1,52 @@ ++++ elfutils-0.175/backends/mips_symbol.c +@@ -0,0 +1,53 @@ +/* MIPS specific symbolic name handling. + Copyright (C) 2002, 2003, 2005 Red Hat, Inc. + This file is part of Red Hat elfutils. @@ -686,7 +626,8 @@ index 0000000..ba465fe + +/* Check for the simple reloc types. */ +Elf_Type -+mips_reloc_simple_type (Ebl *ebl __attribute__ ((unused)), int type) ++mips_reloc_simple_type (Ebl *ebl __attribute__ ((unused)), int type, ++ int *addsub __attribute__ ((unused))) +{ + switch (type) + { @@ -700,11 +641,11 @@ index 0000000..ba465fe + return ELF_T_NUM; + } +} -diff --git a/libebl/eblopenbackend.c b/libebl/eblopenbackend.c -index 8b063f4..5405b0c 100644 ---- a/libebl/eblopenbackend.c -+++ b/libebl/eblopenbackend.c -@@ -72,6 +72,8 @@ static const struct +Index: elfutils-0.175/libebl/eblopenbackend.c +=================================================================== +--- elfutils-0.175.orig/libebl/eblopenbackend.c ++++ elfutils-0.175/libebl/eblopenbackend.c +@@ -71,6 +71,8 @@ static const struct { "sparc", "elf_sparc", "sparc", 5, EM_SPARC, 0, 0 }, { "sparc", "elf_sparcv8plus", "sparc", 5, EM_SPARC32PLUS, 0, 0 }, { "s390", "ebl_s390", "s390", 4, EM_S390, 0, 0 }, @@ -713,6 +654,34 @@ index 8b063f4..5405b0c 100644 { "m32", "elf_m32", "m32", 3, EM_M32, 0, 0 }, { "m68k", "elf_m68k", "m68k", 4, EM_68K, ELFCLASS32, ELFDATA2MSB }, --- -2.7.4 - +Index: elfutils-0.175/backends/Makefile.am +=================================================================== +--- elfutils-0.175.orig/backends/Makefile.am ++++ elfutils-0.175/backends/Makefile.am +@@ -33,13 +33,13 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I + + + modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \ +- tilegx m68k bpf riscv parisc ++ tilegx m68k bpf riscv parisc mips + libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \ + libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \ + libebl_aarch64_pic.a libebl_sparc_pic.a libebl_ppc_pic.a \ + libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a \ + libebl_m68k_pic.a libebl_bpf_pic.a libebl_riscv_pic.a \ +- libebl_parisc_pic.a ++ libebl_parisc_pic.a libebl_mips_pic.a + noinst_LIBRARIES = $(libebl_pic) + noinst_DATA = $(libebl_pic:_pic.a=.so) + +@@ -141,6 +141,10 @@ parisc_SRCS = parisc_init.c parisc_symbo + libebl_parisc_pic_a_SOURCES = $(parisc_SRCS) + am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os) + ++mips_SRCS = mips_init.c mips_symbol.c mips_regs.c mips_retval.c ++libebl_mips_pic_a_SOURCES = $(mips_SRCS) ++am_libebl_mips_pic_a_OBJECTS = $(mips_SRCS:.c=.os) ++ + libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) $(libeu) + @rm -f $(@:.so=.map) + $(AM_V_at)echo 'ELFUTILS_$(PACKAGE_VERSION) { global: $*_init; local: *; };' \ diff --git a/poky/meta/recipes-devtools/elfutils/files/debian/mips_readelf_w.patch b/poky/meta/recipes-devtools/elfutils/files/debian/mips_readelf_w.patch new file mode 100644 index 000000000..d26e72e28 --- /dev/null +++ b/poky/meta/recipes-devtools/elfutils/files/debian/mips_readelf_w.patch @@ -0,0 +1,25 @@ +From: Kurt Roeckx <kurt@roeckx.be> +Subject: Make readelf -w output debug information on mips +Bug-Debian: http://bugs.debian.org/662041 +Forwarded: not-needed + +Upstreams wants a change where this is handled by a hook that needs +to be filled in by the backend for the arch. + +Upstream-Status: Pending [from debian] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +Index: elfutils-0.175/src/readelf.c +=================================================================== +--- elfutils-0.175.orig/src/readelf.c ++++ elfutils-0.175/src/readelf.c +@@ -11133,7 +11133,8 @@ print_debug (Dwfl_Module *dwflmod, Ebl * + GElf_Shdr shdr_mem; + GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem); + +- if (shdr != NULL && shdr->sh_type == SHT_PROGBITS) ++ if (shdr != NULL && ( ++ (shdr->sh_type == SHT_PROGBITS) || (shdr->sh_type == SHT_MIPS_DWARF))) + { + static const struct + { diff --git a/poky/meta/recipes-devtools/gdb/gdb-8.2.inc b/poky/meta/recipes-devtools/gdb/gdb-8.2.inc index dfb005912..7e0809de7 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-8.2.inc +++ b/poky/meta/recipes-devtools/gdb/gdb-8.2.inc @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" SRC_URI = "http://ftp.gnu.org/gnu/gdb/gdb-${PV}.tar.xz \ - file://0001-include-sys-types.h-for-mode_t.patch \ file://0002-make-man-install-relative-to-DESTDIR.patch \ file://0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ file://0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ diff --git a/poky/meta/recipes-devtools/gdb/gdb/0001-include-sys-types.h-for-mode_t.patch b/poky/meta/recipes-devtools/gdb/gdb/0001-include-sys-types.h-for-mode_t.patch deleted file mode 100644 index 2c8783e19..000000000 --- a/poky/meta/recipes-devtools/gdb/gdb/0001-include-sys-types.h-for-mode_t.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6ae0fb9b49047cef338262e30273f63139fd1261 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 19 Jan 2016 18:18:52 -0800 -Subject: [PATCH 01/11] include sys/types.h for mode_t - -mode_t is used in target.h, so we need to include sys/types.h to get the -defintion - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gdb/gdbserver/target.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gdb/gdbserver/target.h b/gdb/gdbserver/target.h -index fce54e05ad..278cee78a8 100644 ---- a/gdb/gdbserver/target.h -+++ b/gdb/gdbserver/target.h -@@ -29,6 +29,7 @@ - #include "mem-break.h" - #include "btrace-common.h" - #include <vector> -+#include <sys/types.h> - - struct emit_ops; - struct buffer; --- -2.18.0 - diff --git a/poky/meta/recipes-devtools/go/go-1.11.inc b/poky/meta/recipes-devtools/go/go-1.11.inc index c02e4683b..d626514ae 100644 --- a/poky/meta/recipes-devtools/go/go-1.11.inc +++ b/poky/meta/recipes-devtools/go/go-1.11.inc @@ -15,6 +15,7 @@ SRC_URI += "\ file://0005-make.bash-override-CC-when-building-dist-and-go_boot.patch \ file://0006-cmd-dist-separate-host-and-target-builds.patch \ file://0007-cmd-go-make-GOROOT-precious-by-default.patch \ + file://0008-use-GOBUILDMODE-to-set-buildmode.patch \ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" diff --git a/poky/meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch b/poky/meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch new file mode 100644 index 000000000..b6ab50433 --- /dev/null +++ b/poky/meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch @@ -0,0 +1,40 @@ +From 0e0c247f0caec23528889ff09d98348cba9028f1 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 26 Oct 2018 15:02:32 +0800 +Subject: [PATCH] use GOBUILDMODE to set buildmode + +While building go itself, the go build system does not support +to set `-buildmode=pie' from environment. + +Add GOBUILDMODE to support it which make PIE executables the default +build mode, as PIE executables are required as of Yocto + +Refers: https://groups.google.com/forum/#!topic/golang-dev/gRCe5URKewI +Upstream-Status: Denied [upstream choose antoher solution: `17a256b +cmd/go: -buildmode=pie for android/arm'] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + src/cmd/go/internal/work/build.go | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go +index 145b875..595d703 100644 +--- a/src/cmd/go/internal/work/build.go ++++ b/src/cmd/go/internal/work/build.go +@@ -218,7 +218,11 @@ func AddBuildFlags(cmd *base.Command) { + + cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "") + cmd.Flag.Var(buildCompiler{}, "compiler", "") +- cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", "default", "") ++ if bm := os.Getenv("GOBUILDMODE"); bm != "" { ++ cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", bm, "") ++ } else { ++ cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", "default", "") ++ } + cmd.Flag.Var(&load.BuildGcflags, "gcflags", "") + cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "") + cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "") +-- +2.7.4 + diff --git a/poky/meta/recipes-devtools/go/go-1.9.inc b/poky/meta/recipes-devtools/go/go-1.9.inc index 329cee061..ba1eaa051 100644 --- a/poky/meta/recipes-devtools/go/go-1.9.inc +++ b/poky/meta/recipes-devtools/go/go-1.9.inc @@ -19,6 +19,7 @@ SRC_URI += "\ file://0008-make.bash-add-GOHOSTxx-indirection-for-cross-canadia.patch \ file://0009-cmd-go-buildmode-pie-forces-external-linking-mode-on.patch \ file://0010-make.bash-override-CC-when-building-dist-and-go_boot.patch \ + file://0011-use-GOBUILDMODE-to-set-buildmode.patch \ " SRC_URI_append_libc-musl = " file://set-external-linker.patch" diff --git a/poky/meta/recipes-devtools/go/go-1.9/0011-use-GOBUILDMODE-to-set-buildmode.patch b/poky/meta/recipes-devtools/go/go-1.9/0011-use-GOBUILDMODE-to-set-buildmode.patch new file mode 100644 index 000000000..da93dc5c1 --- /dev/null +++ b/poky/meta/recipes-devtools/go/go-1.9/0011-use-GOBUILDMODE-to-set-buildmode.patch @@ -0,0 +1,40 @@ +From b928fafab1d9425aae9341806bd2f6178ba1da1f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 26 Oct 2018 16:32:50 +0800 +Subject: [PATCH] use GOBUILDMODE to set buildmode + +While building go itself, the go build system does not support +to set `-buildmode=pie' from environment. + +Add GOBUILDMODE to support it which make PIE executables the default +build mode, as PIE executables are required as of Yocto + +Refers: https://groups.google.com/forum/#!topic/golang-dev/gRCe5URKewI +Upstream-Status: Denied [upstream choose antoher solution: `17a256b +cmd/go: -buildmode=pie for android/arm'] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + src/cmd/go/internal/work/build.go | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go +index b276de5..1683e7e 100644 +--- a/src/cmd/go/internal/work/build.go ++++ b/src/cmd/go/internal/work/build.go +@@ -211,7 +211,11 @@ func AddBuildFlags(cmd *base.Command) { + + cmd.Flag.Var((*base.StringsFlag)(&buildAsmflags), "asmflags", "") + cmd.Flag.Var(buildCompiler{}, "compiler", "") +- cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", "default", "") ++ if bm := os.Getenv("GOBUILDMODE"); bm != "" { ++ cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", bm, "") ++ } else { ++ cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", "default", "") ++ } + cmd.Flag.Var((*base.StringsFlag)(&buildGcflags), "gcflags", "") + cmd.Flag.Var((*base.StringsFlag)(&buildGccgoflags), "gccgoflags", "") + cmd.Flag.StringVar(&cfg.BuildContext.InstallSuffix, "installsuffix", "", "") +-- +2.7.4 + diff --git a/poky/meta/recipes-devtools/go/go_1.11.bb b/poky/meta/recipes-devtools/go/go_1.11.bb index c67e2cb05..42cdb0430 100644 --- a/poky/meta/recipes-devtools/go/go_1.11.bb +++ b/poky/meta/recipes-devtools/go/go_1.11.bb @@ -1,2 +1,14 @@ require go-${PV}.inc require go-target.inc + +export GOBUILDMODE="" + +# Add pie to GOBUILDMODE to satisfy "textrel" QA checking, but mips +# doesn't support -buildmode=pie, so skip the QA checking for mips and its +# variants. +python() { + if 'mips' in d.getVar('TARGET_ARCH'): + d.appendVar('INSANE_SKIP_%s' % d.getVar('PN'), " textrel") + else: + d.setVar('GOBUILDMODE', 'pie') +} diff --git a/poky/meta/recipes-devtools/go/go_1.9.bb b/poky/meta/recipes-devtools/go/go_1.9.bb index 7da7897cf..c23ea0c1a 100644 --- a/poky/meta/recipes-devtools/go/go_1.9.bb +++ b/poky/meta/recipes-devtools/go/go_1.9.bb @@ -5,6 +5,7 @@ export GO_TARGET_INSTALL = "cmd" export GO_FLAGS = "-a" export CC_FOR_TARGET = "${CC}" export CXX_FOR_TARGET = "${CXX}" +export GOBUILDMODE="" do_compile() { export GOBIN="${B}/bin" @@ -16,9 +17,12 @@ do_compile() { cd ${B} } -# for aarch64 ends with textrel in ${PN} -# http://errors.yoctoproject.org/Errors/Details/185634/ -# ERROR: QA Issue: ELF binary '/work/aarch64-oe-linux/go/1.9.7-r0/packages-split/go/usr/lib/go/bin/go' has relocations in .text -# ELF binary '/work/aarch64-oe-linux/go/1.9.7-r0/packages-split/go/usr/lib/go/pkg/tool/linux_arm64/trace' has relocations in .text -# ELF binary '/work/aarch64-oe-linux/go/1.9.7-r0/packages-split/go/usr/lib/go/pkg/tool/linux_arm64/pprof' has relocations in .text [textrel] -INSANE_SKIP_${PN} += "textrel" +# Add pie to GOBUILDMODE to satisfy "textrel" QA checking, but mips +# doesn't support -buildmode=pie, so skip the QA checking for mips and its +# variants. +python() { + if 'mips' in d.getVar('TARGET_ARCH'): + d.appendVar('INSANE_SKIP_%s' % d.getVar('PN'), " textrel") + else: + d.setVar('GOBUILDMODE', 'pie') +} diff --git a/poky/meta/recipes-devtools/meson/meson.inc b/poky/meta/recipes-devtools/meson/meson.inc index b7fb3e698..61b239148 100644 --- a/poky/meta/recipes-devtools/meson/meson.inc +++ b/poky/meta/recipes-devtools/meson/meson.inc @@ -11,13 +11,16 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0003-native_bindir.patch \ file://gi-flags.patch \ file://gtkdoc-flags.patch \ + file://0001-python-module-do-not-manipulate-the-environment-when.patch \ + file://disable-rpath-handling.patch \ " SRC_URI[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb" SRC_URI[md5sum] = "31bda3519d8c0eb3438267268a78085e" -SRC_URI_append_class-native = "file://0002-Make-CPU-family-warnings-fatal.patch \ - file://0001-Support-building-allarch-recipes-again.patch \ - " +SRC_URI_append_class-native = " \ + file://0002-Make-CPU-family-warnings-fatal.patch \ + file://0001-Support-building-allarch-recipes-again.patch \ +" UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" diff --git a/poky/meta/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch b/poky/meta/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch index f6dd23091..96be104a5 100644 --- a/poky/meta/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch +++ b/poky/meta/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch @@ -11,11 +11,11 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> mesonbuild/environment.py | 1 + 1 file changed, 1 insertion(+) -diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index a0580a2..712b1e8 100644 ---- a/mesonbuild/environment.py -+++ b/mesonbuild/environment.py -@@ -73,6 +73,7 @@ from .compilers import ( +Index: meson-0.47.2/mesonbuild/environment.py +=================================================================== +--- meson-0.47.2.orig/mesonbuild/environment.py ++++ meson-0.47.2/mesonbuild/environment.py +@@ -75,6 +75,7 @@ from .compilers import ( build_filename = 'meson.build' known_cpu_families = ( @@ -23,6 +23,3 @@ index a0580a2..712b1e8 100644 'aarch64', 'arm', 'e2k', --- -2.12.0 - diff --git a/poky/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/poky/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch new file mode 100644 index 000000000..607298540 --- /dev/null +++ b/poky/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch @@ -0,0 +1,43 @@ +From 45426f06689a520fc47f81ee29b49d509f11ba58 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 19 Nov 2018 14:24:26 +0100 +Subject: [PATCH] python module: do not manipulate the environment when calling + pkg-config + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + mesonbuild/modules/python.py | 14 -------------- + 1 file changed, 14 deletions(-) + +diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py +index 1195d8a..df81da4 100644 +--- a/mesonbuild/modules/python.py ++++ b/mesonbuild/modules/python.py +@@ -67,26 +67,12 @@ class PythonDependency(ExternalDependency): + if DependencyMethods.PKGCONFIG in self.methods and not python_holder.is_pypy: + pkg_version = self.variables.get('LDVERSION') or self.version + pkg_libdir = self.variables.get('LIBPC') +- old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR') +- old_pkg_path = os.environ.get('PKG_CONFIG_PATH') +- +- os.environ.pop('PKG_CONFIG_PATH', None) +- +- if pkg_libdir: +- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir + + try: + self.pkgdep = PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs) + except Exception: + pass + +- if old_pkg_path is not None: +- os.environ['PKG_CONFIG_PATH'] = old_pkg_path +- +- if old_pkg_libdir is not None: +- os.environ['PKG_CONFIG_LIBDIR'] = old_pkg_libdir +- else: +- os.environ.pop('PKG_CONFIG_LIBDIR', None) + + if self.pkgdep and self.pkgdep.found(): + self.compile_args = self.pkgdep.get_compile_args() diff --git a/poky/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch b/poky/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch new file mode 100644 index 000000000..4b1fb57dd --- /dev/null +++ b/poky/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch @@ -0,0 +1,26 @@ +We need to allow our rpaths generated through the compiler flags to make it into +our binaries. Therefore disable the meson manipulations of these unless there +is a specific directive to do something differently in the project. + +RP 2018/11/23 + +Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567] + +Index: meson-0.47.2/mesonbuild/minstall.py +=================================================================== +--- meson-0.47.2.orig/mesonbuild/minstall.py ++++ meson-0.47.2/mesonbuild/minstall.py +@@ -486,8 +486,11 @@ class Installer: + printed_symlink_error = True + if os.path.isfile(outname): + try: +- depfixer.fix_rpath(outname, install_rpath, final_path, +- install_name_mappings, verbose=False) ++ if install_rpath: ++ depfixer.fix_rpath(outname, install_rpath, final_path, ++ install_name_mappings, verbose=False) ++ else: ++ print("RPATH changes at install time disabled") + except SystemExit as e: + if isinstance(e.code, int) and e.code == 0: + pass diff --git a/poky/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-Fix-link-relocation-support.patch b/poky/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-Fix-link-relocation-support.patch new file mode 100644 index 000000000..9dc488b7a --- /dev/null +++ b/poky/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-Fix-link-relocation-support.patch @@ -0,0 +1,40 @@ +From 18562ccae6996431d37767653b061d4e9e1b9424 Mon Sep 17 00:00:00 2001 +From: Niko Mauno <niko.mauno@iki.fi> +Date: Sun, 11 Nov 2018 15:50:22 +0200 +Subject: [opkg-utils PATCH] update-alternatives: Fix link relocation support + +Commit fcb26339000021eb9bb711aa264247aebcfdd4ae which added Debian-style +support for link relocation tries to relocate symbolic link on host OS, +resulting in following-like error when two alternative packages have +symbolic link source located in different directories (/bin/rev -> +/bin/busybox.nosuid and /usr/bin/rev -> /usr/bin/rev.util-linux): + + update-alternatives: renaming rev link from /bin/rev to /usr/bin/rev + mv: cannot stat '/bin/rev': No such file or directory + +Fix the issue by prefixing 'olink' and 'link' variable references with +path to targeted root filesystem's root directory. + +Upstream-Status: Submitted [opkg-utils] + +Signed-off-by: Niko Mauno <niko.mauno@iki.fi> +--- + update-alternatives | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/update-alternatives b/update-alternatives +index 89a440b..d4fa7eb 100644 +--- a/update-alternatives ++++ b/update-alternatives +@@ -58,7 +58,7 @@ register_alt() { + local link_str=`echo $link | protect_slashes` + sed -e "1s/.*/$link_str/" $ad/$name > $ad/$name.new + mv $ad/$name.new $ad/$name +- mv $olink $link ++ mv $OPKG_OFFLINE_ROOT$olink $OPKG_OFFLINE_ROOT$link + fi + else + echo "$link" > "$ad/$name" +-- +2.19.1 + diff --git a/poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb b/poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb index cb3775d9c..4c41774c3 100644 --- a/poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb +++ b/poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb @@ -13,6 +13,7 @@ SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV file://0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch \ file://threaded-xz.patch \ file://pigz.patch \ + file://0001-update-alternatives-Fix-link-relocation-support.patch \ " SRC_URI_append_class-native = " file://tar_ignore_error.patch" UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" diff --git a/poky/meta/recipes-devtools/python/python-native_2.7.15.bb b/poky/meta/recipes-devtools/python/python-native_2.7.15.bb index 7c491fa3e..de35104c6 100644 --- a/poky/meta/recipes-devtools/python/python-native_2.7.15.bb +++ b/poky/meta/recipes-devtools/python/python-native_2.7.15.bb @@ -69,7 +69,11 @@ python(){ import json pythondir = d.getVar('THISDIR',True) with open(pythondir+'/python/python2-manifest.json') as manifest_file: - python_manifest=json.load(manifest_file) + manifest_str = manifest_file.read() + json_start = manifest_str.find('# EOC') + 6 + manifest_file.seek(json_start) + manifest_str = manifest_file.read() + python_manifest = json.loads(manifest_str) rprovides = d.getVar('RPROVIDES').split() diff --git a/poky/meta/recipes-devtools/python/python/create_manifest2.py b/poky/meta/recipes-devtools/python/python/create_manifest2.py index 87999991d..b6748653b 100644 --- a/poky/meta/recipes-devtools/python/python/create_manifest2.py +++ b/poky/meta/recipes-devtools/python/python/create_manifest2.py @@ -22,7 +22,7 @@ # # # This way we will create a new manifest from the data structure that was built during -# this process, ont this new manifest each package will contain specifically only +# this process, on this new manifest each package will contain specifically only # what it needs to run. # # There are some caveats which we try to deal with, such as repeated files on different @@ -30,7 +30,7 @@ # Its also important to note that this method only works for python files, and shared # libraries. Static libraries, header files and binaries need to be dealt with manually. # -# Author: Alejandro Enedino Hernandez Samaniego "aehs29" <aehs29@gmail.com> +# Author: Alejandro Enedino Hernandez Samaniego "aehs29" <aehs29 at gmail dot com> import sys @@ -62,10 +62,21 @@ def isFolder(value): else: return False +def prepend_comments(comments, json_manifest): + with open(json_manifest, 'r+') as manifest: + json_contents = manifest.read() + manifest.seek(0, 0) + manifest.write(comments + json_contents) + # Read existing JSON manifest with open('python2-manifest.json') as manifest: - old_manifest = json.load(manifest, object_pairs_hook=collections.OrderedDict) - + # The JSON format doesn't allow comments so we hack the call to keep the comments using a marker + manifest_str = manifest.read() + json_start = manifest_str.find('# EOC') + 6 # EOC + \n + manifest.seek(0) + comments = manifest.read(json_start) + manifest_str = manifest.read() + old_manifest = json.loads(manifest_str, object_pairs_hook=collections.OrderedDict) # First pass to get core-package functionality, because we base everything on the fact that core is actually working # Not exactly the same so it should not be a function @@ -277,3 +288,5 @@ for key in new_manifest: # Create the manifest from the data structure that was built with open('python2-manifest.json.new','w') as outfile: json.dump(new_manifest,outfile, indent=4) + +prepend_comments(comments,'python2-manifest.json.new') diff --git a/poky/meta/recipes-devtools/python/python/python2-manifest.json b/poky/meta/recipes-devtools/python/python/python2-manifest.json index 260fa6f80..c092e69d3 100644 --- a/poky/meta/recipes-devtools/python/python/python2-manifest.json +++ b/poky/meta/recipes-devtools/python/python/python2-manifest.json @@ -1,3 +1,93 @@ +# DO NOT (entirely) modify this file manually, please read. +# +# IMPORTANT NOTE: +# Please keep in mind that the create_manifest task relies on the fact the the +# target and native Python packages are the same, and it also needs to be executed +# with a fully working native package (with all the PACKAGECONFIGs enabled and all +# and all the modules should be working, check log.do_compile), otherwise the script +# will fail to find dependencies correctly, this note is valid either if you are +# upgrading to a new Python version or adding a new package. +# +# +# If you are adding a new package please follow the next steps: +# How to add a new package: +# - If a user wants to add a new package all that has to be done is: +# Modify the python2-manifest.json file, and add the required file(s) to the FILES list, +# fill up the SUMMARY section as well, the script should handle all the rest. +# +# Real example: +# We want to add a web browser package, including the file webbrowser.py +# which at the moment is on python-misc. +# "webbrowser": { +# "files": ["${libdir}/python2.7/lib-dynload/webbrowser.py"], +# "rdepends": [], +# "summary": "Python Web Browser support"} +# +# * Note that the rdepends field was left empty +# +# We run $ bitbake python -c create_manifest and the resulting manifest +# should be completed after a few seconds, showing something like: +# "webbrowser": { +# "files": ["${libdir}/python2.7/webbrowser.py"], +# "rdepends": ["core","fcntl","io","pickle","shell","subprocess"], +# "summary": "Python Web Browser support"} +# +# +# If you are upgrading Python to a new version please follow the next steps: +# After each Python upgrade, the create_manifest task should be executed, because we +# don't control what changes on upstream Python, so, some module dependency +# might have changed without us realizing it, a certain module can either have +# more or less dependencies, or could be depending on a new file that was just +# created on the new release and for obvious reasons we wouldn't have it on our +# old manifest, all of these issues would cause runtime errors on our system. +# +# - Upgrade both the native and target Python packages to a new version +# - Run the create_manifest task for the target Python package as its shown below: +# +# $ bitbake python -c create_manifest +# +# This will automatically replace your manifest file located under the Python directory +# with an new one, which contains the new dependencies (if any). +# +# Several things could have gone wrong here, I will try to explain a few: +# +# a) A new file was introduced on this release, e.g. sha3*.so: +# The task will check what its needed to import every module, more than one module would +# would probably depend on sha3*.so, although only one module should contain it. +# +# After running the task, the new manifest will have the sha3*.so file on more than one +# module, you need to manually decide which one of them should get it and delete it from +# the others, for example sha3*.so should likely be on ${PN}-crypt. +# Once you have deleted from the others you need to run the create_manifest task again, +# this will populate the other module's rdepends fields, with ${PN}-crypt and you should be +# good to go. +# +# b) The native package wasn't built correctly and its missing a certain module: +# As mentioned before, you need to make sure the native package was built with all the modules +# because it is used as base to build the manifest file, you need to manually check log.do_compile +# since it won't error out the compile function if its only missing a couple of modules. +# +# e.g. missing the _uuid module, log.do_compile would show the following: +# Python build finished successfully! +# The necessary bits to build these optional modules were not found: +# _uuid +# +# What will happen here is that the new manifest would not be aware that the _uuid module exists, so +# not only we won't know of any dependencies to it, but also, the _uuid* files will be packaged on +# the misc package (which is where any file that doesn't belong anywhere else ends up). +# +# This will eventually cause runtime errors on our system if we don't include the misc package on +# on our image, because the _uuid files will be missing. +# If we build the _uuid module correctly and run the create_manifest task the _uuid files will be +# detected correctly along with its dependencies, and we will get a working manifest. +# +# This is the reason why it is important to make sure we have a fully working native build, +# so we can avoid these errors. +# +# +# +# DO NOT MODIFY THE NEXT LINE!, IT IS USED AS A MARKER FOR THE ACTUAL JSON MANIFEST +# EOC { "tests": { "summary": "Python test suite", diff --git a/poky/meta/recipes-devtools/python/python3-native_3.5.6.bb b/poky/meta/recipes-devtools/python/python3-native_3.5.6.bb index d5953cf4b..56236da07 100644 --- a/poky/meta/recipes-devtools/python/python3-native_3.5.6.bb +++ b/poky/meta/recipes-devtools/python/python3-native_3.5.6.bb @@ -6,7 +6,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://12-distutils-prefix-is-inside-staging-area.patch \ file://python-config.patch \ file://030-fixup-include-dirs.patch \ -file://070-dont-clean-ipkg-install.patch \ file://080-distutils-dont_adjust_files.patch \ file://130-readline-setup.patch \ file://150-fix-setupterm.patch \ diff --git a/poky/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch b/poky/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch deleted file mode 100644 index f9971c6ba..000000000 --- a/poky/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch +++ /dev/null @@ -1,38 +0,0 @@ -consider opkg directories when cleaning up - --Khem - -Upstream-Status: Inappropriate [OE specific] - ---- - Makefile.pre.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -Index: Python-3.5.3/Makefile.pre.in -=================================================================== ---- Python-3.5.3.orig/Makefile.pre.in -+++ Python-3.5.3/Makefile.pre.in -@@ -1574,8 +1574,8 @@ touch: - # Sanitation targets -- clean leaves libraries, executables and tags - # files, which clobber removes as well - pycremoval: -- -find $(srcdir) -depth -name '__pycache__' -exec rm -rf {} ';' -- -find $(srcdir) -name '*.py[co]' -exec rm -f {} ';' -+ -find $(srcdir) ! -path './ipkg-install/*' -depth -name '__pycache__' -exec rm -rf {} ';' -+ -find $(srcdir) ! -path './ipkg-install/*' -name '*.py[co]' -exec rm -f {} ';' - - rmtestturds: - -rm -f *BAD *GOOD *SKIPPED -@@ -1589,9 +1589,9 @@ docclean: - -rm -rf Doc/tools/sphinx Doc/tools/pygments Doc/tools/docutils - - clean: pycremoval -- find . -name '*.[oa]' -exec rm -f {} ';' -- find . -name '*.s[ol]' -exec rm -f {} ';' -- find . -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';' -+ find . ! -path './ipkg-install/*' -name '*.[oa]' -exec rm -f {} ';' -+ find . ! -path './ipkg-install/*' -name '*.s[ol]' -exec rm -f {} ';' -+ find . ! -path './ipkg-install/*' -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';' - find build -name 'fficonfig.h' -exec rm -f {} ';' || true - find build -name '*.py' -exec rm -f {} ';' || true - find build -name '*.py[co]' -exec rm -f {} ';' || true diff --git a/poky/meta/recipes-devtools/python/python3_3.5.6.bb b/poky/meta/recipes-devtools/python/python3_3.5.6.bb index 31f8eada1..2cb65045a 100644 --- a/poky/meta/recipes-devtools/python/python3_3.5.6.bb +++ b/poky/meta/recipes-devtools/python/python3_3.5.6.bb @@ -9,8 +9,6 @@ DISTRO_SRC_URI_linuxstdbase = "" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://python-config.patch \ file://030-fixup-include-dirs.patch \ -file://070-dont-clean-ipkg-install.patch \ -file://080-distutils-dont_adjust_files.patch \ file://130-readline-setup.patch \ file://150-fix-setupterm.patch \ file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ @@ -285,7 +283,7 @@ python(){ for value in python_manifest[key]['files']: d.appendVar('FILES_' + pypackage, ' ' + value) - # Add cached files + # Add cached files if include_pycs == '1': for value in python_manifest[key]['cached']: d.appendVar('FILES_' + pypackage, ' ' + value) diff --git a/poky/meta/recipes-devtools/python/python_2.7.15.bb b/poky/meta/recipes-devtools/python/python_2.7.15.bb index dd969d8e7..c22c762d9 100644 --- a/poky/meta/recipes-devtools/python/python_2.7.15.bb +++ b/poky/meta/recipes-devtools/python/python_2.7.15.bb @@ -198,7 +198,11 @@ python(){ bb.parse.mark_dependency(d, filename) with open(filename) as manifest_file: - python_manifest=json.load(manifest_file, object_pairs_hook=collections.OrderedDict) + manifest_str = manifest_file.read() + json_start = manifest_str.find('# EOC') + 6 + manifest_file.seek(json_start) + manifest_str = manifest_file.read() + python_manifest = json.loads(manifest_str, object_pairs_hook=collections.OrderedDict) include_pycs = d.getVar('INCLUDE_PYCS') diff --git a/poky/meta/recipes-devtools/ruby/ruby_2.5.1.bb b/poky/meta/recipes-devtools/ruby/ruby_2.5.3.bb index 1197323e9..e9f045378 100644 --- a/poky/meta/recipes-devtools/ruby/ruby_2.5.1.bb +++ b/poky/meta/recipes-devtools/ruby/ruby_2.5.3.bb @@ -6,8 +6,8 @@ SRC_URI += " \ file://CVE-2018-1000073.patch \ " -SRC_URI[md5sum] = "23867bc8c16c55e43b14dfe0614bcfa8" -SRC_URI[sha256sum] = "dac81822325b79c3ba9532b048c2123357d3310b2b40024202f360251d9829b1" +SRC_URI[md5sum] = "20c85b67846d49622ef3b24230803fef" +SRC_URI[sha256sum] = "9828d03852c37c20fa333a0264f2490f07338576734d910ee3fd538c9520846c" # it's unknown to configure script, but then passed to extconf.rb # maybe it's not really needed as we're hardcoding the result with diff --git a/poky/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb b/poky/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb index 97e58a446..50f8221eb 100644 --- a/poky/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb +++ b/poky/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb @@ -96,6 +96,19 @@ do_install_append () { TUNE = "${@strip_mcpu(d)}" +VALGRINDARCH ?= "${TARGET_ARCH}" +VALGRINDARCH_aarch64 = "arm64" +VALGRINDARCH_x86-64 = "amd64" +VALGRINDARCH_x86 = "x86" +VALGRINDARCH_mips = "mips32" +VALGRINDARCH_mipsel = "mips32" +VALGRINDARCH_mips64el = "mips64" +VALGRINDARCH_powerpc = "ppc" +VALGRINDARCH_powerpc64 = "ppc64" +VALGRINDARCH_powerpc64el = "ppc64le" + +INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/valgrind/vgpreload_memcheck-${VALGRINDARCH}-linux.so" + RDEPENDS_${PN} += "perl" # valgrind needs debug information for ld.so at runtime in order to diff --git a/poky/meta/recipes-extended/cpio/cpio-2.12/0001-Fix-segfault-with-append.patch b/poky/meta/recipes-extended/cpio/cpio-2.12/0001-Fix-segfault-with-append.patch new file mode 100644 index 000000000..2043c890c --- /dev/null +++ b/poky/meta/recipes-extended/cpio/cpio-2.12/0001-Fix-segfault-with-append.patch @@ -0,0 +1,87 @@ +Upstream-Status: Submitted [bugs-cpio] +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From 3f0bd5a40ad0ceaee78c74a52a7166ed7f08db81 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup <praiskup@redhat.com> +Date: Thu, 29 Nov 2018 07:03:48 +0100 +Subject: [PATCH] Fix segfault with --append + +The --append mode combines both process_copy_in() and +process_copy_out() methods, each of them working with different +(local) file_hdr->c_name buffers. So ensure that +cpio_set_c_name() isn't using the same static variable for +maintaining length of different buffers. + +Complements d36ec5f4e93130efb24fb9. Thanks to Ross Burton. + +* src/copyin.c (process_copy_in): Always initialize file_hdr. +* src/copyout.c (process_copy_out): Likewise. +* src/cpiohdr.h (cpio_file_stat): Add c_name_buflen variable. +* src/util.c (cpio_set_c_name): Use file_hdr->c_name_buflen. +--- + src/copyin.c | 1 + + src/copyout.c | 1 + + src/cpiohdr.h | 1 + + src/util.c | 3 ++- + 4 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/copyin.c b/src/copyin.c +index ba887ae..767c2f8 100644 +--- a/src/copyin.c ++++ b/src/copyin.c +@@ -1213,6 +1213,7 @@ process_copy_in () + + newdir_umask = umask (0); /* Reset umask to preserve modes of + created files */ ++ memset (&file_hdr, 0, sizeof (struct cpio_file_stat)); + + /* Initialize the copy in. */ + if (pattern_file_name) +diff --git a/src/copyout.c b/src/copyout.c +index 7532dac..fb890cb 100644 +--- a/src/copyout.c ++++ b/src/copyout.c +@@ -594,6 +594,7 @@ process_copy_out () + + /* Initialize the copy out. */ + ds_init (&input_name, 128); ++ memset (&file_hdr, 0, sizeof (struct cpio_file_stat)); + file_hdr.c_magic = 070707; + + /* Check whether the output file might be a tape. */ +diff --git a/src/cpiohdr.h b/src/cpiohdr.h +index 588135b..cf64f3e 100644 +--- a/src/cpiohdr.h ++++ b/src/cpiohdr.h +@@ -127,6 +127,7 @@ struct cpio_file_stat /* Internal representation of a CPIO header */ + uint32_t c_chksum; + char *c_name; + char *c_tar_linkname; ++ size_t c_name_buflen; + }; + + void cpio_set_c_name(struct cpio_file_stat *file_hdr, char *name); +diff --git a/src/util.c b/src/util.c +index 10486dc..1256469 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -1413,7 +1413,7 @@ set_file_times (int fd, + void + cpio_set_c_name (struct cpio_file_stat *file_hdr, char *name) + { +- static size_t buflen = 0; ++ size_t buflen = file_hdr->c_name_buflen; + size_t len = strlen (name) + 1; + + if (buflen == 0) +@@ -1430,6 +1430,7 @@ cpio_set_c_name (struct cpio_file_stat *file_hdr, char *name) + } + + file_hdr->c_namesize = len; ++ file_hdr->c_name_buflen = buflen; + memmove (file_hdr->c_name, name, len); + } + +-- +2.11.0 + diff --git a/poky/meta/recipes-extended/cpio/cpio_2.12.bb b/poky/meta/recipes-extended/cpio/cpio_2.12.bb index 69d36983e..6ba8337e5 100644 --- a/poky/meta/recipes-extended/cpio/cpio_2.12.bb +++ b/poky/meta/recipes-extended/cpio/cpio_2.12.bb @@ -10,6 +10,7 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0001-Fix-CVE-2015-1197.patch \ file://0001-CVE-2016-2037-1-byte-out-of-bounds-write.patch \ + file://0001-Fix-segfault-with-append.patch \ " SRC_URI[md5sum] = "fc207561a86b63862eea4b8300313e86" diff --git a/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index d81320a94..beae5f98c 100644 --- a/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -19,7 +19,7 @@ index e891d91..600f8a8 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 4.17, netdev@vger.kernel.org) + AC_INIT(ethtool, 4.19, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu]) diff --git a/poky/meta/recipes-extended/ethtool/ethtool_4.17.bb b/poky/meta/recipes-extended/ethtool/ethtool_4.19.bb index 844a958ed..74e255c24 100644 --- a/poky/meta/recipes-extended/ethtool/ethtool_4.17.bb +++ b/poky/meta/recipes-extended/ethtool/ethtool_4.19.bb @@ -11,8 +11,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[md5sum] = "4dba0345a4ab9f51b4a4a9739284238d" -SRC_URI[sha256sum] = "4130142a15f7409d18de3667998f3c99fba52fd7c8d94be7ecdabf8dcab3d6c1" +SRC_URI[md5sum] = "a533db1d202724822c4ef297643fac12" +SRC_URI[sha256sum] = "e8e88f5a79c78e542cd84fee60b67dbf29cee63e4760e8d61544fea74c761ad1" inherit autotools ptest RDEPENDS_${PN}-ptest += "make" diff --git a/poky/meta/recipes-extended/ghostscript/files/0001-Bug-699795-add-operand-checking-to-.setnativefontmap.patch b/poky/meta/recipes-extended/ghostscript/files/0001-Bug-699795-add-operand-checking-to-.setnativefontmap.patch deleted file mode 100644 index f175da0ca..000000000 --- a/poky/meta/recipes-extended/ghostscript/files/0001-Bug-699795-add-operand-checking-to-.setnativefontmap.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 274b2cc08b0d10a4cac3fe8b50022889f22580cb Mon Sep 17 00:00:00 2001 -From: Chris Liddell <chris.liddell@artifex.com> -Date: Thu, 20 Sep 2018 16:35:28 +0100 -Subject: [PATCH 1/5] Bug 699795: add operand checking to - .setnativefontmapbuilt - -.setnativefontmapbuilt .forceputs a value into systemdict - it is intended -to be a boolean, but in this case was being called with a compound object -(a dictionary). Such an object, in local VM, being forced into systemdict -would then confuse the garbager, since it could be restored away with the -reference remaining. - -This adds operand checking, so .setnativefontmapbuilt will simply ignore -anything other than a boolean value, and also removes the definition of -.setnativefontmapbuilt after use, since it is only used in two, closely -related places. - -CVE: CVE-2018-17961 -Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Resource/Init/gs_fonts.ps | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/Resource/Init/gs_fonts.ps b/Resource/Init/gs_fonts.ps -index 38f0f6c..45b6613 100644 ---- a/Resource/Init/gs_fonts.ps -+++ b/Resource/Init/gs_fonts.ps -@@ -372,9 +372,13 @@ FONTPATH length 0 eq { (%END FONTPATH) .skipeof } if - % of strings: what the system thinks is the ps name, - % and the access path. - /.setnativefontmapbuilt { % set whether we've been run -- systemdict exch /.nativefontmapbuilt exch .forceput -+ dup type /booleantype eq { -+ systemdict exch /.nativefontmapbuilt exch .forceput -+ } -+ {pop} -+ ifelse - } .bind executeonly def --systemdict /NONATIVEFONTMAP known .setnativefontmapbuilt -+systemdict /NONATIVEFONTMAP known //.setnativefontmapbuilt exec - /.buildnativefontmap { % - .buildnativefontmap <bool> - systemdict /.nativefontmapbuilt .knownget not - { //false} if -@@ -415,9 +419,10 @@ systemdict /NONATIVEFONTMAP known .setnativefontmapbuilt - } forall - } if - % record that we've been run -- //true .setnativefontmapbuilt -+ //true //.setnativefontmapbuilt exec - } ifelse - } bind def -+currentdict /.setnativefontmapbuilt .forceundef - - % Create the dictionary that registers the .buildfont procedure - % (called by definefont) for each FontType. --- -2.7.4 - diff --git a/poky/meta/recipes-extended/ghostscript/files/0002-Bug-699816-Improve-hiding-of-security-critical-custo.patch b/poky/meta/recipes-extended/ghostscript/files/0002-Bug-699816-Improve-hiding-of-security-critical-custo.patch deleted file mode 100644 index 000f9c9ef..000000000 --- a/poky/meta/recipes-extended/ghostscript/files/0002-Bug-699816-Improve-hiding-of-security-critical-custo.patch +++ /dev/null @@ -1,434 +0,0 @@ -From 0661bf23a5be32973682e17afed4a2f23a8214ba Mon Sep 17 00:00:00 2001 -From: Chris Liddell <chris.liddell@artifex.com> -Date: Sat, 29 Sep 2018 15:34:55 +0100 -Subject: [PATCH 2/5] Bug 699816: Improve hiding of security critical custom - operators - -Make procedures that use .forceput/.forcedef/.forceundef into operators. - -The result of this is that errors get reported against the "top" operator, -rather than the "called" operator within the procedure. - -For example: -/myproc -{ - myop -} bind def - -If 'myop' throws an error, the error handler will be passed the 'myop' -operator. Promoting 'myproc' to a operator means the error handler will be -passed 'myproc'. - -CVE: CVE-2018-17961 -Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Resource/Init/gs_diskn.ps | 2 +- - Resource/Init/gs_dps.ps | 2 +- - Resource/Init/gs_fntem.ps | 2 +- - Resource/Init/gs_fonts.ps | 10 +++++----- - Resource/Init/gs_lev2.ps | 13 +++++++++---- - Resource/Init/gs_pdfwr.ps | 2 +- - Resource/Init/gs_setpd.ps | 25 +++++++++++++++++-------- - Resource/Init/gs_typ32.ps | 14 +++++++++----- - Resource/Init/gs_type1.ps | 2 +- - Resource/Init/pdf_base.ps | 2 +- - Resource/Init/pdf_draw.ps | 10 +++++----- - Resource/Init/pdf_font.ps | 8 ++++---- - Resource/Init/pdf_main.ps | 4 ++-- - Resource/Init/pdf_ops.ps | 8 ++++---- - 14 files changed, 61 insertions(+), 43 deletions(-) - -diff --git a/Resource/Init/gs_diskn.ps b/Resource/Init/gs_diskn.ps -index 5540715..26ec0b5 100644 ---- a/Resource/Init/gs_diskn.ps -+++ b/Resource/Init/gs_diskn.ps -@@ -53,7 +53,7 @@ systemdict begin - exch .setglobal - } - if --} .bind executeonly def % must be bound and hidden for .forceput -+} .bind executeonly odef % must be bound and hidden for .forceput - - % Modify .putdevparams to force regeneration of .searchabledevs list - /.putdevparams { -diff --git a/Resource/Init/gs_dps.ps b/Resource/Init/gs_dps.ps -index cad7056..daf7b0f 100644 ---- a/Resource/Init/gs_dps.ps -+++ b/Resource/Init/gs_dps.ps -@@ -70,7 +70,7 @@ - % Save a copy of the initial gstate. - //systemdict /savedinitialgstate gstate readonly .forceput - .setglobal --} .bind executeonly def % must be bound and hidden for .forceput -+} .bind executeonly odef % must be bound and hidden for .forceput - - % Initialize local dictionaries and gstate when creating a new context. - % Note that until this completes, we are in the anomalous situation of -diff --git a/Resource/Init/gs_fntem.ps b/Resource/Init/gs_fntem.ps -index 3ceee18..c1f7651 100644 ---- a/Resource/Init/gs_fntem.ps -+++ b/Resource/Init/gs_fntem.ps -@@ -408,7 +408,7 @@ currentdict end def - exit - } loop - exch setglobal --} .bind executeonly def % must be bound and hidden for .forceput -+} .bind executeonly odef % must be bound and hidden for .forceput - - currentdict end /ProcSet defineresource pop - -diff --git a/Resource/Init/gs_fonts.ps b/Resource/Init/gs_fonts.ps -index 45b6613..89c3ab7 100644 ---- a/Resource/Init/gs_fonts.ps -+++ b/Resource/Init/gs_fonts.ps -@@ -377,8 +377,8 @@ FONTPATH length 0 eq { (%END FONTPATH) .skipeof } if - } - {pop} - ifelse --} .bind executeonly def --systemdict /NONATIVEFONTMAP known //.setnativefontmapbuilt exec -+} .bind executeonly odef -+systemdict /NONATIVEFONTMAP known .setnativefontmapbuilt - /.buildnativefontmap { % - .buildnativefontmap <bool> - systemdict /.nativefontmapbuilt .knownget not - { //false} if -@@ -419,7 +419,7 @@ systemdict /NONATIVEFONTMAP known //.setnativefontmapbuilt exec - } forall - } if - % record that we've been run -- //true //.setnativefontmapbuilt exec -+ //true .setnativefontmapbuilt - } ifelse - } bind def - currentdict /.setnativefontmapbuilt .forceundef -@@ -1103,7 +1103,7 @@ $error /SubstituteFont { } put - - % Check to make sure the font was actually loaded. - dup 3 index .fontknownget -- { dup /PathLoad 4 index //.putgstringcopy exec -+ { dup /PathLoad 4 index .putgstringcopy - 4 1 roll pop pop pop //true exit - } if - -@@ -1115,7 +1115,7 @@ $error /SubstituteFont { } put - { % Stack: origfontname fontdirectory path filefontname - 2 index 1 index .fontknownget - { % Yes. Stack: origfontname fontdirectory path filefontname fontdict -- dup 4 -1 roll /PathLoad exch //.putgstringcopy exec -+ dup 4 -1 roll /PathLoad exch .putgstringcopy - % Stack: origfontname fontdirectory filefontname fontdict - 3 -1 roll pop - % Stack: origfontname filefontname fontdict -diff --git a/Resource/Init/gs_lev2.ps b/Resource/Init/gs_lev2.ps -index eee0b9f..a8ed892 100644 ---- a/Resource/Init/gs_lev2.ps -+++ b/Resource/Init/gs_lev2.ps -@@ -163,10 +163,11 @@ end - % Set them again to the new values. From here on, we are safe, - % since a context switch will consult userparams. - .setuserparams --} .bind executeonly def % must be bound and hidden for .forceput -+} .bind executeonly odef % must be bound and hidden for .forceput - - /setuserparams { % <dict> setuserparams - -- .setuserparams2 -+ {.setuserparams2} stopped -+ {/setuserparams load $error /errorname get signalerror} if - } .bind odef - % Initialize user parameters managed here. - /JobName () .definepsuserparam -@@ -415,7 +416,9 @@ psuserparams /ProcessDSCComment {.checkprocesscomment} put - - % VMReclaim and VMThreshold are user parameters. - /setvmthreshold { % <int> setvmthreshold - -- mark /VMThreshold 2 .argindex .dicttomark .setuserparams2 pop -+ mark /VMThreshold 2 .argindex .dicttomark {.setuserparams2} stopped -+ {pop /setvmthreshold load $error /errorname get signalerror} -+ {pop} ifelse - } odef - /vmreclaim { % <int> vmreclaim - - dup 0 gt { -@@ -427,7 +430,9 @@ psuserparams /ProcessDSCComment {.checkprocesscomment} put - ifelse - } { - % VMReclaim userparam controls enable/disable GC -- mark /VMReclaim 2 index .dicttomark .setuserparams2 pop -+ mark /VMReclaim 2 index .dicttomark {.setuserparams2} stopped -+ {pop /vmreclaim load $error /errorname get signalerror} -+ {pop} ifelse - } ifelse - } odef - -1 setvmthreshold -diff --git a/Resource/Init/gs_pdfwr.ps b/Resource/Init/gs_pdfwr.ps -index fb1c419..58e75d3 100644 ---- a/Resource/Init/gs_pdfwr.ps -+++ b/Resource/Init/gs_pdfwr.ps -@@ -660,7 +660,7 @@ currentdict /.pdfmarkparams .undef - { - pop - } ifelse --} .bind executeonly def % must be bound and hidden for .forceput -+} .bind executeonly odef % must be bound and hidden for .forceput - - % Use the DSC processing hook to pass DSC comments to the driver. - % We use a pseudo-parameter named DSC whose value is an array: -diff --git a/Resource/Init/gs_setpd.ps b/Resource/Init/gs_setpd.ps -index 8fa7c51..afb4ffa 100644 ---- a/Resource/Init/gs_setpd.ps -+++ b/Resource/Init/gs_setpd.ps -@@ -608,6 +608,20 @@ NOMEDIAATTRS { - % in the <failed> dictionary with the policy value, - % and we replace the key in the <merged> dictionary with its prior value - % (or remove it if it had no prior value). -+ -+% Making this an operator means we can properly hide -+% the contents - specifically .forceput -+/1Policy -+{ -+ % Roll back the failed request to its previous status. -+ SETPDDEBUG { (Rolling back.) = pstack flush } if -+ 3 index 2 index 3 -1 roll .forceput -+ 4 index 1 index .knownget -+ { 4 index 3 1 roll .forceput } -+ { 3 index exch .undef } -+ ifelse -+} bind executeonly odef -+ - /.policyprocs mark - % These procedures are called with the following on the stack: - % <orig> <merged> <failed> <Policies> <key> <policy> -@@ -631,14 +645,7 @@ NOMEDIAATTRS { - /setpagedevice .systemvar /configurationerror signalerror - } ifelse - } bind -- 1 { % Roll back the failed request to its previous status. --SETPDDEBUG { (Rolling back.) = pstack flush } if -- 3 index 2 index 3 -1 roll .forceput -- 4 index 1 index .knownget -- { 4 index 3 1 roll .forceput } -- { 3 index exch .undef } -- ifelse -- } .bind executeonly % must be bound and hidden for .forceput -+ 1 /1Policy load - 7 { % For PageSize only, just impose the request. - 1 index /PageSize eq - { pop pop 1 index /PageSize 7 put } -@@ -646,6 +653,8 @@ SETPDDEBUG { (Rolling back.) = pstack flush } if - ifelse - } bind - .dicttomark readonly def -+currentdict /1Policy undef -+ - /.applypolicies % <orig> <merged> <failed> .applypolicies - % <orig> <merged'> <failed'> - { 1 index /Policies get 1 index -diff --git a/Resource/Init/gs_typ32.ps b/Resource/Init/gs_typ32.ps -index b6600b0..9150f71 100644 ---- a/Resource/Init/gs_typ32.ps -+++ b/Resource/Init/gs_typ32.ps -@@ -79,15 +79,19 @@ systemdict /.removeglyphs .undef - .dicttomark /ProcSet defineresource pop - - /.cidfonttypes where { pop } { /.cidfonttypes 6 dict def } ifelse --.cidfonttypes begin -- --4 % CIDFontType 4 = FontType 32 --{ dup /FontType 32 .forceput -+/CIDFontType4 -+{ -+ dup /FontType 32 .forceput - dup /CharStrings 20 dict .forceput - 1 index exch .buildfont32 exch pop --} .bind executeonly def % must be bound and hidden for .forceput -+} .bind executeonly odef -+.cidfonttypes begin -+ -+ -+4 /CIDFontType4 load def % CIDFontType 4 = FontType 32 - - end % .cidfonttypes -+currentdict /CIDFontType4 .forceundef - - % Define the BuildGlyph procedure. - % Since Type 32 fonts are indexed by CID, there is no BuildChar procedure. -diff --git a/Resource/Init/gs_type1.ps b/Resource/Init/gs_type1.ps -index efdae48..2935d9c 100644 ---- a/Resource/Init/gs_type1.ps -+++ b/Resource/Init/gs_type1.ps -@@ -283,7 +283,7 @@ currentdict /closesourcedict .undef - } if - 2 copy /WeightVector exch .forceput - .setweightvector --} .bind executeonly def -+} .bind executeonly odef - end - - % Register the font types for definefont. -diff --git a/Resource/Init/pdf_base.ps b/Resource/Init/pdf_base.ps -index a82a2a3..7ccd4cd 100644 ---- a/Resource/Init/pdf_base.ps -+++ b/Resource/Init/pdf_base.ps -@@ -218,7 +218,7 @@ currentdict /num-chars-dict .undef - } ifelse - } ifelse - } ifelse --} bind executeonly def -+} bind executeonly odef - /PDFScanRules_true << /PDFScanRules //true >> def - /PDFScanRules_null << /PDFScanRules //null >> def - /.pdfrun { % <file> <opdict> .pdfrun - -diff --git a/Resource/Init/pdf_draw.ps b/Resource/Init/pdf_draw.ps -index d1b6ac9..c239daf 100644 ---- a/Resource/Init/pdf_draw.ps -+++ b/Resource/Init/pdf_draw.ps -@@ -1158,7 +1158,7 @@ currentdict end readonly def - Q - PDFDEBUG { pdfdict /PDFSTEPcount .knownget { 1 le } { //true } ifelse { (%End PaintProc) print dup === flush } if } if - PDFfile exch setfileposition --} bind executeonly def -+} bind executeonly odef - - /.pdfpaintproc { - %% Get the /m from pdfopdict (must be present) -@@ -1189,7 +1189,7 @@ currentdict end readonly def - { - switch_to_text_marking_ops - } if --}bind executeonly def -+}bind executeonly odef - - /resolvepattern { % <patternstreamdict> resolvepattern <patterndict> - % Don't do the resolvestream now: just capture the data -@@ -2353,7 +2353,7 @@ currentdict /last-ditch-bpc-csp undef - }{ - pdfdict /AppearanceNumber 0 .forceput - } ifelse --}bind executeonly def -+}bind executeonly odef - - /MakeAppearanceName { - pdfdict /AppearanceNumber get -@@ -2382,7 +2382,7 @@ currentdict /last-ditch-bpc-csp undef - DoForm - pdfdict /.PreservePDFForm 3 -1 roll .forceput - grestore --} bind executeonly def -+} bind executeonly odef - - /DoForm { - %% save the current value, if its true we will set it to false later, in order -@@ -2541,7 +2541,7 @@ currentdict /last-ditch-bpc-csp undef - end - } if - pdfdict /.PreservePDFForm 3 -1 roll .forceput --} bind executeonly def -+} bind executeonly odef - - /_dops_save 1 array def - -diff --git a/Resource/Init/pdf_font.ps b/Resource/Init/pdf_font.ps -index feaf0d0..535b14a 100644 ---- a/Resource/Init/pdf_font.ps -+++ b/Resource/Init/pdf_font.ps -@@ -718,7 +718,7 @@ currentdict end readonly def - {pop pop pop} - ifelse - --} bind executeonly def -+} bind executeonly odef - - currentdict /.DoToUnicode? .forceundef - -@@ -1241,7 +1241,7 @@ currentdict /eexec_pdf_param_dict .undef - } bdef - dup currentdict Encoding .processToUnicode - currentdict end .completefont exch pop --} bind executeonly def -+} bind executeonly odef - /.adjustcharwidth { % <wx> <wy> .adjustcharwidth <wx'> <wy'> - % Enforce the metrics, in glyph space, to the values found in the PDF Font object - % - force wy == 0 (assumed, and not stored in the PDF font) -@@ -2026,7 +2026,7 @@ currentdict /CMap_read_dict undef - } if - /findresource cvx /undefined signalerror - } loop --} bind executeonly def -+} bind executeonly odef - - /buildCIDType0 { % <CIDFontType0-font-resource> buildCIDType0 <font> - dup /BaseFont get findCIDFont exch pop -@@ -2211,7 +2211,7 @@ currentdict /CMap_read_dict undef - /Type0 //buildType0 - /Type1 //buildType1 - /MMType1 //buildType1 -- /Type3 //buildType3 -+ /Type3 /buildType3 load - /TrueType //buildTrueType - /CIDFontType0 //buildCIDType0 - /CIDFontType2 //buildCIDType2 -diff --git a/Resource/Init/pdf_main.ps b/Resource/Init/pdf_main.ps -index 09f8735..c823e69 100644 ---- a/Resource/Init/pdf_main.ps -+++ b/Resource/Init/pdf_main.ps -@@ -660,7 +660,7 @@ currentdict /runpdfstring .undef - } forall - pop - } ifelse --} bind executeonly def -+} bind executeonly odef - - currentdict /pdf_collection_files .undef - -@@ -2715,7 +2715,7 @@ currentdict /PDF2PS_matrix_key undef - .setglobal - /RepairedAnError exch def - /Repaired exch def --} bind executeonly def -+} bind executeonly odef - - % Display the contents of a page (including annotations). - /showpagecontents { % <pagedict> showpagecontents - -diff --git a/Resource/Init/pdf_ops.ps b/Resource/Init/pdf_ops.ps -index c45fc51..8672d61 100644 ---- a/Resource/Init/pdf_ops.ps -+++ b/Resource/Init/pdf_ops.ps -@@ -193,7 +193,7 @@ currentdict /gput_always_allow .undef - pdfformaterror - } ifelse - } if --} bind executeonly def -+} bind executeonly odef - - % Save PDF gstate - /qstate { % - qstate <qstate> -@@ -451,7 +451,7 @@ currentdict /gput_always_allow .undef - %% a gsave, so we haven't copied it to /self, if we don't do that here - %% then transparent annotations cause an invalid access error. - currentdict //nodict eq {/self dup load end 5 dict begin def} if --} bind executeonly def -+} bind executeonly odef - /AIS { .setalphaisshape } bind executeonly def - /BM { - /.setblendmode where { -@@ -1077,7 +1077,7 @@ end readonly def - pdfopdict /v {inside_text_v} bind .forceput - pdfopdict /y {inside_text_y} bind .forceput - pdfopdict /re {inside_text_re} bind .forceput --} bind executeonly def -+} bind executeonly odef - - /switch_to_normal_marking_ops { - pdfopdict /m {normal_m} bind .forceput -@@ -1086,7 +1086,7 @@ end readonly def - pdfopdict /v {normal_v} bind .forceput - pdfopdict /y {normal_y} bind .forceput - pdfopdict /re {normal_re} bind .forceput --} bind executeonly def -+} bind executeonly odef - - /BT { - currentdict /TextSaveMatrix known { --- -2.7.4 - diff --git a/poky/meta/recipes-extended/ghostscript/files/0003-Bug-699832-add-control-over-hiding-error-handlers.patch b/poky/meta/recipes-extended/ghostscript/files/0003-Bug-699832-add-control-over-hiding-error-handlers.patch deleted file mode 100644 index cd7865958..000000000 --- a/poky/meta/recipes-extended/ghostscript/files/0003-Bug-699832-add-control-over-hiding-error-handlers.patch +++ /dev/null @@ -1,172 +0,0 @@ -From 1f9a91c86bd56acf57826b9b0e020ebe1953e2ae Mon Sep 17 00:00:00 2001 -From: Chris Liddell <chris.liddell@artifex.com> -Date: Thu, 4 Oct 2018 10:42:13 +0100 -Subject: [PATCH 3/5] Bug 699832: add control over hiding error handlers. - -With a previous commit changing error handling in SAFER so the handler gets -passed a name object (rather than executable object), it is less critical to -hide the error handlers. - -This introduces a -dSAFERERRORS option to force only use of the default error -handlers. - -It also adds a .setsafererrors Postscript call, meaning a caller, without --dSAFERERRORS, can create their own default error handlers (in errordict, as -normal), and then call .setsafererrors meaning their own handlers are always -called. - -With -dSAFERERRORS or after a call to .setsafererrors, .setsafererrors is -removed. - -CVE: CVE-2018-17961 -Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Resource/Init/gs_init.ps | 42 +++++++++++++++++++++++++++++------------ - psi/interp.c | 49 ++++++++++++++++++++++++++++-------------------- - 2 files changed, 59 insertions(+), 32 deletions(-) - -diff --git a/Resource/Init/gs_init.ps b/Resource/Init/gs_init.ps -index bec307d..f952f32 100644 ---- a/Resource/Init/gs_init.ps -+++ b/Resource/Init/gs_init.ps -@@ -188,6 +188,16 @@ currentdict /DELAYSAFER known { /DELAYSAFER //true def /NOSAFER //true def } if - currentdict /PARANOIDSAFER known or % PARANOIDSAFER is equivalent - } - ifelse def -+ -+/SAFERERRORS -+currentdict /NOSAFERERRORS known -+{ -+ //false -+} -+{ -+ currentdict /SAFERERRORS known -+} ifelse def -+ - currentdict /SHORTERRORS known /SHORTERRORS exch def - currentdict /TTYPAUSE known /TTYPAUSE exch def - currentdict /WRITESYSTEMDICT known /WRITESYSTEMDICT exch def -@@ -1123,12 +1133,23 @@ errordict begin - } bind def - end % errordict - --% Put all the default handlers in gserrordict --gserrordict --errordict {2 index 3 1 roll put} forall --noaccess pop --% remove the non-standard errors from errordict -+gserrordict /unknownerror errordict /unknownerror get put - errordict /unknownerror .undef -+ -+/.SAFERERRORLIST ErrorNames def -+/.setsafererrors -+{ -+% Put all the requested handlers in gserrordict -+ gserrordict -+ //.SAFERERRORLIST -+ {dup errordict exch get 2 index 3 1 roll put} forall -+ noaccess pop -+ systemdict /.setsafeerrors .forceundef -+ systemdict /.SAFERERRORLIST .forceundef -+} bind executeonly odef -+ -+SAFERERRORS {.setsafererrors} if -+ - % Define a stable private copy of handleerror that we will always use under - % JOBSERVER mode. - /.GShandleerror errordict /handleerror get def -@@ -1760,18 +1781,15 @@ currentdict /.runlibfile .undef - - % Bind all the operators defined as procedures. - /.bindoperators % binds operators in currentdict -- { % Temporarily disable the typecheck error. -- errordict /typecheck 2 copy get -- errordict /typecheck { pop } put % pop the command -+ { - currentdict - { dup type /operatortype eq -- { % This might be a real operator, so bind might cause a typecheck, -- % but we've made the error a no-op temporarily. -- .bind -+ { -+ % This might be a real operator, so bind might cause a typecheck -+ {.bind} .internalstopped pop - } - if pop pop - } forall -- put - } def - DELAYBIND not { .bindoperators } if - -diff --git a/psi/interp.c b/psi/interp.c -index 3dd5f7a..cd894f9 100644 ---- a/psi/interp.c -+++ b/psi/interp.c -@@ -662,27 +662,18 @@ again: - if (gs_errorname(i_ctx_p, code, &error_name) < 0) - return code; /* out-of-range error code! */ - -- /* If LockFilePermissions is true, we only refer to gserrordict, which -- * is not accessible to Postcript jobs -+ /* We refer to gserrordict first, which is not accessible to Postcript jobs -+ * If we're running with SAFERERRORS all the handlers are copied to gserrordict -+ * so we'll always find the default one. If not SAFERERRORS, only gs specific -+ * errors are in gserrordict. - */ -- if (i_ctx_p->LockFilePermissions) { -- if (((dict_find_string(systemdict, "gserrordict", &perrordict) <= 0 || -- dict_find(perrordict, &error_name, &epref) <= 0)) -- ) -- return code; /* error name not in errordict??? */ -- } -- else { -- /* -- * For greater Adobe compatibility, only the standard PostScript errors -- * are defined in errordict; the rest are in gserrordict. -- */ -- if (dict_find_string(systemdict, "errordict", &perrordict) <= 0 || -- (dict_find(perrordict, &error_name, &epref) <= 0 && -- (dict_find_string(systemdict, "gserrordict", &perrordict) <= 0 || -- dict_find(perrordict, &error_name, &epref) <= 0)) -- ) -- return code; /* error name not in errordict??? */ -- } -+ if (dict_find_string(systemdict, "gserrordict", &perrordict) <= 0 || -+ (dict_find(perrordict, &error_name, &epref) <= 0 && -+ (dict_find_string(systemdict, "errordict", &perrordict) <= 0 || -+ dict_find(perrordict, &error_name, &epref) <= 0)) -+ ) -+ return code; /* error name not in errordict??? */ -+ - doref = *epref; - epref = &doref; - /* Push the error object on the operand stack if appropriate. */ -@@ -695,6 +686,24 @@ again: - } - *osp = *perror_object; - errorexec_find(i_ctx_p, osp); -+ /* If using SAFER, hand a name object to the error handler, rather than the executable -+ * object/operator itself. -+ */ -+ if (i_ctx_p->LockFilePermissions) { -+ code = obj_cvs(imemory, osp, buf + 2, 256, &rlen, (const byte **)&bufptr); -+ if (code < 0) { -+ const char *unknownstr = "--unknown--"; -+ rlen = strlen(unknownstr); -+ memcpy(buf, unknownstr, rlen); -+ } -+ else { -+ buf[0] = buf[1] = buf[rlen + 2] = buf[rlen + 3] = '-'; -+ rlen += 4; -+ } -+ code = name_ref(imemory, buf, rlen, osp, 1); -+ if (code < 0) -+ make_null(osp); -+ } - } - goto again; - } --- -2.7.4 - diff --git a/poky/meta/recipes-extended/ghostscript/files/0004-For-hidden-operators-pass-a-name-object-to-error-han.patch b/poky/meta/recipes-extended/ghostscript/files/0004-For-hidden-operators-pass-a-name-object-to-error-han.patch deleted file mode 100644 index 6c715ad43..000000000 --- a/poky/meta/recipes-extended/ghostscript/files/0004-For-hidden-operators-pass-a-name-object-to-error-han.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 34a8c5aa987d4db5234172a62218b168371606b1 Mon Sep 17 00:00:00 2001 -From: Chris Liddell <chris.liddell@artifex.com> -Date: Tue, 2 Oct 2018 16:02:58 +0100 -Subject: [PATCH 4/5] For hidden operators, pass a name object to error - handler. - -In normal operation, Postscript error handlers are passed the object which -triggered the error: this is invariably an operator object. - -The issue arises when an error is triggered by an operator which is for internal -use only, and that operator is then passed to the error handler, meaning it -becomes visible to the error handler code. - -By converting to a name object, the error message is still valid, but we no -longer expose internal use only operators. - -The change in gs_dps1.ps is related to the above: previously an error in -scheck would throw an error against .gcheck, but as .gcheck is now a hidden -operator, it resulted in a name object being passed to the error handler. As -scheck is a 'real' operator, it's better to use the real operator, rather than -the name of an internal, hidden one. - -CVE: CVE-2018-17961 -Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Resource/Init/gs_dps1.ps | 2 +- - psi/interp.c | 33 ++++++++++++++++++++++++--------- - 2 files changed, 25 insertions(+), 10 deletions(-) - -diff --git a/Resource/Init/gs_dps1.ps b/Resource/Init/gs_dps1.ps -index 1182f53..ec5db61 100644 ---- a/Resource/Init/gs_dps1.ps -+++ b/Resource/Init/gs_dps1.ps -@@ -21,7 +21,7 @@ level2dict begin - % ------ Virtual memory ------ % - - /currentshared /.currentglobal load def --/scheck /.gcheck load def -+/scheck {.gcheck} bind odef - %****** FOLLOWING IS WRONG ****** - /shareddict currentdict /globaldict .knownget not { 20 dict } if def - -diff --git a/psi/interp.c b/psi/interp.c -index cd894f9..b70769d 100644 ---- a/psi/interp.c -+++ b/psi/interp.c -@@ -678,6 +678,8 @@ again: - epref = &doref; - /* Push the error object on the operand stack if appropriate. */ - if (!GS_ERROR_IS_INTERRUPT(code)) { -+ byte buf[260], *bufptr; -+ uint rlen; - /* Replace the error object if within an oparray or .errorexec. */ - osp++; - if (osp >= ostop) { -@@ -686,23 +688,36 @@ again: - } - *osp = *perror_object; - errorexec_find(i_ctx_p, osp); -- /* If using SAFER, hand a name object to the error handler, rather than the executable -- * object/operator itself. -- */ -- if (i_ctx_p->LockFilePermissions) { -+ -+ if (!r_has_type(osp, t_string) && !r_has_type(osp, t_name)) { - code = obj_cvs(imemory, osp, buf + 2, 256, &rlen, (const byte **)&bufptr); - if (code < 0) { - const char *unknownstr = "--unknown--"; - rlen = strlen(unknownstr); - memcpy(buf, unknownstr, rlen); -+ bufptr = buf; - } - else { -- buf[0] = buf[1] = buf[rlen + 2] = buf[rlen + 3] = '-'; -- rlen += 4; -+ ref *tobj; -+ bufptr[rlen] = '\0'; -+ /* Only pass a name object if the operator doesn't exist in systemdict -+ * i.e. it's an internal operator we have hidden -+ */ -+ code = dict_find_string(systemdict, (const char *)bufptr, &tobj); -+ if (code < 0) { -+ buf[0] = buf[1] = buf[rlen + 2] = buf[rlen + 3] = '-'; -+ rlen += 4; -+ bufptr = buf; -+ } -+ else { -+ bufptr = NULL; -+ } -+ } -+ if (bufptr) { -+ code = name_ref(imemory, buf, rlen, osp, 1); -+ if (code < 0) -+ make_null(osp); - } -- code = name_ref(imemory, buf, rlen, osp, 1); -- if (code < 0) -- make_null(osp); - } - } - goto again; --- -2.7.4 - diff --git a/poky/meta/recipes-extended/ghostscript/files/0005-Bug-699938-.loadfontloop-must-be-an-operator.patch b/poky/meta/recipes-extended/ghostscript/files/0005-Bug-699938-.loadfontloop-must-be-an-operator.patch deleted file mode 100644 index 4924b3cac..000000000 --- a/poky/meta/recipes-extended/ghostscript/files/0005-Bug-699938-.loadfontloop-must-be-an-operator.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f0a61679d28bc1561640403d92492e199bc1c0f3 Mon Sep 17 00:00:00 2001 -From: Chris Liddell <chris.liddell@artifex.com> -Date: Wed, 10 Oct 2018 23:25:51 +0100 -Subject: [PATCH 5/5] Bug 699938: .loadfontloop must be an operator - -In the fix for Bug 699816, I omitted to make .loadfontloop into an operator, to -better hide .forceundef and .putgstringcopy. - -CVE: CVE-2018-17961 -Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Resource/Init/gs_fonts.ps | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Resource/Init/gs_fonts.ps b/Resource/Init/gs_fonts.ps -index 89c3ab7..72feff2 100644 ---- a/Resource/Init/gs_fonts.ps -+++ b/Resource/Init/gs_fonts.ps -@@ -1148,7 +1148,7 @@ $error /SubstituteFont { } put - - } loop % end of loop - -- } bind executeonly def % must be bound and hidden for .putgstringcopy -+ } bind executeonly odef % must be bound and hidden for .putgstringcopy - - currentdict /.putgstringcopy .undef - --- -2.7.4 - diff --git a/poky/meta/recipes-extended/ghostscript/files/0006-Undefine-some-additional-internal-operators.patch b/poky/meta/recipes-extended/ghostscript/files/0006-Undefine-some-additional-internal-operators.patch deleted file mode 100644 index 19cf7cc8c..000000000 --- a/poky/meta/recipes-extended/ghostscript/files/0006-Undefine-some-additional-internal-operators.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 37d7c9117b70e75ebed21c6c8192251f127c0fb0 Mon Sep 17 00:00:00 2001 -From: Nancy Durgin <nancy.durgin@artifex.com> -Date: Mon, 5 Nov 2018 15:36:27 +0800 -Subject: [PATCH 1/2] Undefine some additional internal operators. - -.type, .writecvs, .setSMask, .currentSMask - -These don't seem to be referenced anywhere outside of the initialization code, -which binds their usages. Passes cluster if they are removed. - -CVE: CVE-2018-18073 -Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Resource/Init/gs_init.ps | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Resource/Init/gs_init.ps b/Resource/Init/gs_init.ps -index f952f32..7c71d18 100644 ---- a/Resource/Init/gs_init.ps -+++ b/Resource/Init/gs_init.ps -@@ -2230,6 +2230,7 @@ SAFER { .setsafeglobal } if - /.localvmarray /.localvmdict /.localvmpackedarray /.localvmstring /.systemvmarray /.systemvmdict /.systemvmpackedarray /.systemvmstring /.systemvmfile /.systemvmlibfile - /.systemvmSFD /.settrapparams /.currentsystemparams /.currentuserparams /.getsystemparam /.getuserparam /.setsystemparams /.setuserparams - /.checkpassword /.locale_to_utf8 /.currentglobal /.gcheck /.imagepath -+ /.type /.writecvs /.setSMask /.currentSMask - - % Used by a free user in the Library of Congress. Apparently this is used to - % draw a partial page, which is then filled in by the results of a barcode -@@ -2248,7 +2249,7 @@ SAFER { .setsafeglobal } if - % test files/utilities, or engineers expressed a desire to keep them visible. - % - %/currentdevice /.sort /.buildfont0 /.buildfont1 /.buildfont2 /.buildfont3 /.buildfont4 /.buildfont9 /.buildfont10 /.buildfont11 -- %/.buildfotn32 /.buildfont42 /.type9mapcid /.type11mapcid /.swapcolors -+ %/.buildfont32 /.buildfont42 /.type9mapcid /.type11mapcid /.swapcolors - %/currentdevice /.quit /.setuseciecolor /.needinput /.setoverprintmode /.special_op /.dicttomark /.knownget - %/.FAPIavailable /.FAPIpassfont /.FAPIrebuildfont /.FAPIBuildGlyph /.FAPIBuildChar /.FAPIBuildGlyph9 - %/.tempfile /.numicc_components /.set_outputintent /.max /.min /.vmreclaim /.getpath /.setglobal --- -2.7.4 - diff --git a/poky/meta/recipes-extended/ghostscript/files/0007-Bug-699927-don-t-include-operator-arrays-in-execstac.patch b/poky/meta/recipes-extended/ghostscript/files/0007-Bug-699927-don-t-include-operator-arrays-in-execstac.patch deleted file mode 100644 index ad66fc3d6..000000000 --- a/poky/meta/recipes-extended/ghostscript/files/0007-Bug-699927-don-t-include-operator-arrays-in-execstac.patch +++ /dev/null @@ -1,197 +0,0 @@ -From 430f39144244ba4fd7b720cf87031e415e0fabce Mon Sep 17 00:00:00 2001 -From: Chris Liddell <chris.liddell@artifex.com> -Date: Mon, 5 Nov 2018 15:42:52 +0800 -Subject: [PATCH 2/2] Bug 699927: don't include operator arrays in execstack - output - -When we transfer the contents of the execution stack into the array, take the -extra step of replacing any operator arrays on the stack with the operator -that reference them. - -This prevents the contents of Postscript defined, internal only operators (those -created with .makeoperator) being exposed via execstack (and thus, via error -handling). - -This necessitates a change in the resource remapping 'resource', which contains -a procedure which relies on the contents of the operators arrays being present. -As we already had internal-only variants of countexecstack and execstack -(.countexecstack and .execstack) - using those, and leaving thier operation -including the operator arrays means the procedure continues to work correctly. - -Both .countexecstack and .execstack are undefined after initialization. - -Also, when we store the execstack (or part thereof) for an execstackoverflow -error, make the same oparray/operator substitution as above for execstack. - -CVE: CVE-2018-18073 -Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Resource/Init/gs_init.ps | 4 ++-- - Resource/Init/gs_resmp.ps | 2 +- - psi/int.mak | 2 +- - psi/interp.c | 14 +++++++++++--- - psi/interp.h | 2 ++ - psi/zcontrol.c | 13 ++++++++++--- - 6 files changed, 27 insertions(+), 10 deletions(-) - -diff --git a/Resource/Init/gs_init.ps b/Resource/Init/gs_init.ps -index 7c71d18..f4c1053 100644 ---- a/Resource/Init/gs_init.ps -+++ b/Resource/Init/gs_init.ps -@@ -2191,7 +2191,7 @@ SAFER { .setsafeglobal } if - %% but can be easily restored (just delete the name from the list in the array). In future - %% we may remove the operator and the code implementation entirely. - [ -- /.bitadd /.charboxpath /.cond /.countexecstack /.execstack /.runandhide /.popdevicefilter -+ /.bitadd /.charboxpath /.cond /.runandhide /.popdevicefilter - /.execfile /.filenamesplit /.file_name_parent - /.setdefaultmatrix /.isprocfilter /.unread /.psstringencode - /.buildsampledfunction /.isencapfunction /.currentaccuratecurves /.currentcurvejoin /.currentdashadapt /.currentdotlength -@@ -2230,7 +2230,7 @@ SAFER { .setsafeglobal } if - /.localvmarray /.localvmdict /.localvmpackedarray /.localvmstring /.systemvmarray /.systemvmdict /.systemvmpackedarray /.systemvmstring /.systemvmfile /.systemvmlibfile - /.systemvmSFD /.settrapparams /.currentsystemparams /.currentuserparams /.getsystemparam /.getuserparam /.setsystemparams /.setuserparams - /.checkpassword /.locale_to_utf8 /.currentglobal /.gcheck /.imagepath -- /.type /.writecvs /.setSMask /.currentSMask -+ /.type /.writecvs /.setSMask /.currentSMask /.countexecstack /.execstack - - % Used by a free user in the Library of Congress. Apparently this is used to - % draw a partial page, which is then filled in by the results of a barcode -diff --git a/Resource/Init/gs_resmp.ps b/Resource/Init/gs_resmp.ps -index 7cacaf8..9bb4263 100644 ---- a/Resource/Init/gs_resmp.ps -+++ b/Resource/Init/gs_resmp.ps -@@ -183,7 +183,7 @@ setpacking - % We don't check them. - - currentglobal //false setglobal % <object> bGlobal -- countexecstack array execstack % <object> bGlobal [execstack] -+ //false .countexecstack array //false .execstack % <object> bGlobal [execstack] - dup //null exch % <object> bGlobal [execstack] null [execstack] - length 3 sub -1 0 { % <object> bGlobal [execstack] null i - 2 index exch get % <object> bGlobal [execstack] null proc -diff --git a/psi/int.mak b/psi/int.mak -index 5d9b3d5..6ab5bf0 100644 ---- a/psi/int.mak -+++ b/psi/int.mak -@@ -323,7 +323,7 @@ $(PSOBJ)zarray.$(OBJ) : $(PSSRC)zarray.c $(OP) $(memory__h)\ - - $(PSOBJ)zcontrol.$(OBJ) : $(PSSRC)zcontrol.c $(OP) $(string__h)\ - $(estack_h) $(files_h) $(ipacked_h) $(iutil_h) $(store_h) $(stream_h)\ -- $(INT_MAK) $(MAKEDIRS) -+ $(interp_h) $(INT_MAK) $(MAKEDIRS) - $(PSCC) $(PSO_)zcontrol.$(OBJ) $(C_) $(PSSRC)zcontrol.c - - $(PSOBJ)zdict.$(OBJ) : $(PSSRC)zdict.c $(OP)\ -diff --git a/psi/interp.c b/psi/interp.c -index b70769d..6dc0dda 100644 ---- a/psi/interp.c -+++ b/psi/interp.c -@@ -142,7 +142,6 @@ static int oparray_pop(i_ctx_t *); - static int oparray_cleanup(i_ctx_t *); - static int zerrorexec(i_ctx_t *); - static int zfinderrorobject(i_ctx_t *); --static int errorexec_find(i_ctx_t *, ref *); - static int errorexec_pop(i_ctx_t *); - static int errorexec_cleanup(i_ctx_t *); - static int zsetstackprotect(i_ctx_t *); -@@ -761,7 +760,7 @@ copy_stack(i_ctx_t *i_ctx_p, const ref_stack_t * pstack, int skip, ref * arr) - { - uint size = ref_stack_count(pstack) - skip; - uint save_space = ialloc_space(idmemory); -- int code; -+ int code, i; - - if (size > 65535) - size = 65535; -@@ -770,6 +769,15 @@ copy_stack(i_ctx_t *i_ctx_p, const ref_stack_t * pstack, int skip, ref * arr) - if (code >= 0) - code = ref_stack_store(pstack, arr, size, 0, 1, true, idmemory, - "copy_stack"); -+ /* If we are copying the exec stack, try to replace any oparrays with -+ * with the operator than references them -+ */ -+ if (pstack == &e_stack) { -+ for (i = 0; i < size; i++) { -+ if (errorexec_find(i_ctx_p, &arr->value.refs[i]) < 0) -+ make_null(&arr->value.refs[i]); -+ } -+ } - ialloc_set_space(idmemory, save_space); - return code; - } -@@ -1934,7 +1942,7 @@ zfinderrorobject(i_ctx_t *i_ctx_p) - * .errorexec with errobj != null, store it in *perror_object and return 1, - * otherwise return 0; - */ --static int -+int - errorexec_find(i_ctx_t *i_ctx_p, ref *perror_object) - { - long i; -diff --git a/psi/interp.h b/psi/interp.h -index e9275b9..4f551d1 100644 ---- a/psi/interp.h -+++ b/psi/interp.h -@@ -91,5 +91,7 @@ void gs_interp_reset(i_ctx_t *i_ctx_p); - /* Define the top-level interface to the interpreter. */ - int gs_interpret(i_ctx_t **pi_ctx_p, ref * pref, int user_errors, - int *pexit_code, ref * perror_object); -+int -+errorexec_find(i_ctx_t *i_ctx_p, ref *perror_object); - - #endif /* interp_INCLUDED */ -diff --git a/psi/zcontrol.c b/psi/zcontrol.c -index 36da22c..0362cf4 100644 ---- a/psi/zcontrol.c -+++ b/psi/zcontrol.c -@@ -24,6 +24,7 @@ - #include "ipacked.h" - #include "iutil.h" - #include "store.h" -+#include "interp.h" - - /* Forward references */ - static int check_for_exec(const_os_ptr); -@@ -787,7 +788,7 @@ zexecstack2(i_ctx_t *i_ctx_p) - /* Continuation operator to do the actual transfer. */ - /* r_size(op1) was set just above. */ - static int --do_execstack(i_ctx_t *i_ctx_p, bool include_marks, os_ptr op1) -+do_execstack(i_ctx_t *i_ctx_p, bool include_marks, bool include_oparrays, os_ptr op1) - { - os_ptr op = osp; - ref *arefs = op1->value.refs; -@@ -829,6 +830,12 @@ do_execstack(i_ctx_t *i_ctx_p, bool include_marks, os_ptr op1) - strlen(tname), (const byte *)tname); - break; - } -+ case t_array: -+ case t_shortarray: -+ case t_mixedarray: -+ if (!include_oparrays && errorexec_find(i_ctx_p, rq) < 0) -+ make_null(rq); -+ break; - default: - ; - } -@@ -841,14 +848,14 @@ execstack_continue(i_ctx_t *i_ctx_p) - { - os_ptr op = osp; - -- return do_execstack(i_ctx_p, false, op); -+ return do_execstack(i_ctx_p, false, false, op); - } - static int - execstack2_continue(i_ctx_t *i_ctx_p) - { - os_ptr op = osp; - -- return do_execstack(i_ctx_p, op->value.boolval, op - 1); -+ return do_execstack(i_ctx_p, op->value.boolval, true, op - 1); - } - - /* - .needinput - */ --- -2.7.4 - diff --git a/poky/meta/recipes-extended/ghostscript/files/0008-Make-.forceput-unavailable-from-.policyprocs-helper-.patch b/poky/meta/recipes-extended/ghostscript/files/0008-Make-.forceput-unavailable-from-.policyprocs-helper-.patch deleted file mode 100644 index 7cc51629e..000000000 --- a/poky/meta/recipes-extended/ghostscript/files/0008-Make-.forceput-unavailable-from-.policyprocs-helper-.patch +++ /dev/null @@ -1,245 +0,0 @@ -From 9096beaa4451c12dd2a2caf000658fbac4a5bcdf Mon Sep 17 00:00:00 2001 -From: Ken Sharp <ken.sharp@artifex.com> -Date: Mon, 5 Nov 2018 15:51:32 +0800 -Subject: [PATCH] Make .forceput unavailable from '.policyprocs' helper - dictionary - -Bug #69963 "1Policy is a dangerous operator, any callers should be odef" - -Leaving the .policyprocs dictionary with a procedure which is a simple -wrapper for .forceput effectively leaves .forceput available. - -It seems that the only reason to have .policyprocs is to minimise the -code in .applypolicies, so we can remove the dictionary and put the -code straight into .applypolicies, which we can then bind and make -executeonly, which hides the .forceput. Also, since we don't need -.applypolicies after startup, we can undefine that from systemdict too. - -While we're here, review all the uses of .force* to make certain that -there are no other similar cases. This showed a few places where we -hadn't made a function executeonly, so do that too. Its probably not -required, since I'm reasonably sure its impossible to load those -functions as packed arrays (they are all defined as operators), but lets -have a belt and braces approach, the additional time cost is negligible. - -CVE: CVE-2018-18284 -Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Resource/Init/gs_diskn.ps | 2 +- - Resource/Init/gs_dps.ps | 2 +- - Resource/Init/gs_epsf.ps | 2 +- - Resource/Init/gs_fonts.ps | 4 +- - Resource/Init/gs_init.ps | 2 +- - Resource/Init/gs_setpd.ps | 100 ++++++++++++++++++++++++---------------------- - 6 files changed, 58 insertions(+), 54 deletions(-) - -diff --git a/Resource/Init/gs_diskn.ps b/Resource/Init/gs_diskn.ps -index 26ec0b5..fd694bc 100644 ---- a/Resource/Init/gs_diskn.ps -+++ b/Resource/Init/gs_diskn.ps -@@ -61,7 +61,7 @@ systemdict begin - % doesn't get run enough to justify the complication - //.putdevparams - //systemdict /.searchabledevs .forceundef --} .bind odef % must be bound and hidden for .forceundef -+} .bind executeonly odef % must be bound and hidden for .forceundef - - % ------ extend filenameforall to handle wildcards in %dev% part of pattern -------% - /filenameforall { -diff --git a/Resource/Init/gs_dps.ps b/Resource/Init/gs_dps.ps -index daf7b0f..00c14d5 100644 ---- a/Resource/Init/gs_dps.ps -+++ b/Resource/Init/gs_dps.ps -@@ -124,7 +124,7 @@ - /savedinitialgstate .systemvar setgstate gsave - % Wrap up. - end .setglobal --} odef -+} bind executeonly odef - - % Check whether an object is a procedure. - /.proccheck { % <obj> .proccheck <bool> -diff --git a/Resource/Init/gs_epsf.ps b/Resource/Init/gs_epsf.ps -index e4037d9..2d0f677 100644 ---- a/Resource/Init/gs_epsf.ps -+++ b/Resource/Init/gs_epsf.ps -@@ -31,7 +31,7 @@ - /EPSBoundingBoxState 5 def - /EPSBoundingBoxSetState { - //systemdict /EPSBoundingBoxState 3 -1 roll .forceput --} .bind odef % .forceput must be bound and hidden -+} .bind executeonly odef % .forceput must be bound and hidden - - % Parse 4 numbers for a bounding box - /EPSBoundingBoxParse { % (llx lly urx ury) -- llx lly urx ury true OR false -diff --git a/Resource/Init/gs_fonts.ps b/Resource/Init/gs_fonts.ps -index 72feff2..803faca 100644 ---- a/Resource/Init/gs_fonts.ps -+++ b/Resource/Init/gs_fonts.ps -@@ -583,7 +583,7 @@ buildfontdict 3 /.buildfont3 cvx put - } bind def - /.setloadingfont { - //systemdict /.loadingfont 3 -1 roll .forceput --} .bind odef % .forceput must be bound and hidden -+} .bind executeonly odef % .forceput must be bound and hidden - /.loadfont - { % Some buggy fonts leave extra junk on the stack, - % so we have to make a closure that records the stack depth -@@ -1012,7 +1012,7 @@ $error /SubstituteFont { } put - dup length string copy - .forceput setglobal - } ifelse --} .bind odef % must be bound and hidden for .forceput -+} .bind executeonly odef % must be bound and hidden for .forceput - - % Attempt to load a font from a file. - /.tryloadfont { % <fontname> .tryloadfont <font> true -diff --git a/Resource/Init/gs_init.ps b/Resource/Init/gs_init.ps -index f4c1053..07ee968 100644 ---- a/Resource/Init/gs_init.ps -+++ b/Resource/Init/gs_init.ps -@@ -2230,7 +2230,7 @@ SAFER { .setsafeglobal } if - /.localvmarray /.localvmdict /.localvmpackedarray /.localvmstring /.systemvmarray /.systemvmdict /.systemvmpackedarray /.systemvmstring /.systemvmfile /.systemvmlibfile - /.systemvmSFD /.settrapparams /.currentsystemparams /.currentuserparams /.getsystemparam /.getuserparam /.setsystemparams /.setuserparams - /.checkpassword /.locale_to_utf8 /.currentglobal /.gcheck /.imagepath -- /.type /.writecvs /.setSMask /.currentSMask /.countexecstack /.execstack -+ /.type /.writecvs /.setSMask /.currentSMask /.countexecstack /.execstack /.applypolicies - - % Used by a free user in the Library of Congress. Apparently this is used to - % draw a partial page, which is then filled in by the results of a barcode -diff --git a/Resource/Init/gs_setpd.ps b/Resource/Init/gs_setpd.ps -index afb4ffa..7c076ad 100644 ---- a/Resource/Init/gs_setpd.ps -+++ b/Resource/Init/gs_setpd.ps -@@ -609,6 +609,23 @@ NOMEDIAATTRS { - % and we replace the key in the <merged> dictionary with its prior value - % (or remove it if it had no prior value). - -+% These procedures are called with the following on the stack: -+% <orig> <merged> <failed> <Policies> <key> <policy> -+% They are expected to consume the top 2 operands. -+% NOTE: we currently treat all values other than 0, 1, or 7 (for PageSize) -+% the same as 0, i.e., we signal an error. -+/0Policy { % Set errorinfo and signal a configurationerror. -+ NOMEDIAATTRS { -+ % NOMEDIAATTRS means that the default policy is 7... -+ pop 2 index exch 7 put -+ } { -+ pop dup 4 index exch get 2 array astore -+ $error /errorinfo 3 -1 roll put -+ cleartomark -+ /setpagedevice .systemvar /configurationerror signalerror -+ } ifelse -+} bind executeonly odef -+ - % Making this an operator means we can properly hide - % the contents - specifically .forceput - /1Policy -@@ -617,59 +634,46 @@ NOMEDIAATTRS { - SETPDDEBUG { (Rolling back.) = pstack flush } if - 3 index 2 index 3 -1 roll .forceput - 4 index 1 index .knownget -- { 4 index 3 1 roll .forceput } -- { 3 index exch .undef } -+ { 4 index 3 1 roll .forceput } -+ { 3 index exch .undef } - ifelse - } bind executeonly odef - --/.policyprocs mark --% These procedures are called with the following on the stack: --% <orig> <merged> <failed> <Policies> <key> <policy> --% They are expected to consume the top 2 operands. --% NOTE: we currently treat all values other than 0, 1, or 7 (for PageSize) --% the same as 0, i.e., we signal an error. --% --% M. Sweet, Easy Software Products: --% --% Define NOMEDIAATTRS to turn off the default (but unimplementable) media --% selection policies for setpagedevice. This is used by CUPS to support --% the standard Adobe media attributes. -- 0 { % Set errorinfo and signal a configurationerror. -- NOMEDIAATTRS { -- % NOMEDIAATTRS means that the default policy is 7... -- pop 2 index exch 7 put -- } { -- pop dup 4 index exch get 2 array astore -- $error /errorinfo 3 -1 roll put -- cleartomark -- /setpagedevice .systemvar /configurationerror signalerror -- } ifelse -- } bind -- 1 /1Policy load -- 7 { % For PageSize only, just impose the request. -- 1 index /PageSize eq -- { pop pop 1 index /PageSize 7 put } -- { .policyprocs 0 get exec } -- ifelse -- } bind --.dicttomark readonly def --currentdict /1Policy undef -+/7Policy { % For PageSize only, just impose the request. -+ 1 index /PageSize eq -+ { pop pop 1 index /PageSize 7 put } -+ { .policyprocs 0 get exec } -+ ifelse -+} bind executeonly odef - - /.applypolicies % <orig> <merged> <failed> .applypolicies - % <orig> <merged'> <failed'> -- { 1 index /Policies get 1 index -- { type /integertype eq -- { pop % already processed -- } -- { 2 copy .knownget not { 1 index /PolicyNotFound get } if -- % Stack: <orig> <merged> <failed> <Policies> <key> -- % <policy> -- .policyprocs 1 index .knownget not { .policyprocs 0 get } if exec -- } -- ifelse -- } -- forall pop -- } bind def -+{ -+ 1 index /Policies get 1 index -+ { type /integertype eq -+ { -+ pop % already processed -+ }{ -+ 2 copy .knownget not { 1 index /PolicyNotFound get } if -+ % Stack: <orig> <merged> <failed> <Policies> <key> -+ % <policy> -+ dup 1 eq { -+ 1Policy -+ }{ -+ dup 7 eq { -+ 7Policy -+ }{ -+ 0Policy -+ } ifelse -+ } ifelse -+ } ifelse -+ } -+ forall pop -+} bind executeonly odef -+ -+currentdict /0Policy undef -+currentdict /1Policy undef -+currentdict /7Policy undef - - % Prepare to present parameters to the device, by spreading them onto the - % operand stack and removing any that shouldn't be presented. -@@ -1006,7 +1010,7 @@ SETPDDEBUG { (Installing.) = pstack flush } if - .postinstall - } ifelse - setglobal % return to original VM allocation mode --} odef -+} bind executeonly odef - - % We break out the code after calling the Install procedure into a - % separate procedure, since it is executed even if Install causes an error. --- -2.7.4 - diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript_9.25.bb b/poky/meta/recipes-extended/ghostscript/ghostscript_9.26.bb index fdca8a2ac..5ca978f86 100644 --- a/poky/meta/recipes-extended/ghostscript/ghostscript_9.25.bb +++ b/poky/meta/recipes-extended/ghostscript/ghostscript_9.26.bb @@ -19,20 +19,12 @@ DEPENDS_class-native = "libpng-native" UPSTREAM_CHECK_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" -SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs925/${BPN}-${PV}.tar.gz \ +SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs926/${BPN}-${PV}.tar.gz \ file://ghostscript-9.15-parallel-make.patch \ file://ghostscript-9.16-Werror-return-type.patch \ file://do-not-check-local-libpng-source.patch \ file://avoid-host-contamination.patch \ file://mkdir-p.patch \ - file://0001-Bug-699795-add-operand-checking-to-.setnativefontmap.patch \ - file://0002-Bug-699816-Improve-hiding-of-security-critical-custo.patch \ - file://0003-Bug-699832-add-control-over-hiding-error-handlers.patch \ - file://0004-For-hidden-operators-pass-a-name-object-to-error-han.patch \ - file://0005-Bug-699938-.loadfontloop-must-be-an-operator.patch \ - file://0006-Undefine-some-additional-internal-operators.patch \ - file://0007-Bug-699927-don-t-include-operator-arrays-in-execstac.patch \ - file://0008-Make-.forceput-unavailable-from-.policyprocs-helper-.patch \ " SRC_URI = "${SRC_URI_BASE} \ @@ -47,8 +39,8 @@ SRC_URI_class-native = "${SRC_URI_BASE} \ file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \ " -SRC_URI[md5sum] = "eebd0fadbfa8e800094422ce65e94d5d" -SRC_URI[sha256sum] = "baafa64740b090bff50b220a6df3be95c46069b7e30f4b4effed28316e5b2389" +SRC_URI[md5sum] = "806bc2dedbc7f69b003f536658e08d4a" +SRC_URI[sha256sum] = "831fc019bd477f7cc2d481dc5395ebfa4a593a95eb2fe1eb231a97e450d7540d" # Put something like # diff --git a/poky/meta/recipes-extended/mdadm/files/run-ptest b/poky/meta/recipes-extended/mdadm/files/run-ptest index 5b276090f..234f97376 100644 --- a/poky/meta/recipes-extended/mdadm/files/run-ptest +++ b/poky/meta/recipes-extended/mdadm/files/run-ptest @@ -1,10 +1,19 @@ #!/bin/sh -./test &>./test.log -if [ $? -eq 0 ] -then - echo "PASS: mdadm" - rm test.log -else - echo "FAIL: mdadm" -fi +LOG="$(pwd)/test.log" +# make the test continue to execute even one fail +./test --keep-going 2>&1|tee ${LOG} +# translate the test report +# "tests/18imsm-r10_4d-takeover-r0_2d... succeeded" -> "PASS: tests/18imsm-r10_4d-takeover-r0_2d" +# "tests/19raid6repair... FAILED - see //log for details" -> "FAIL: tests/19raid6repair" +sed -i -e '/succeeded/ s/^/PASS: /' -e '/FAILED/ s/^/FAIL: /' ${LOG} +sed -i -e 's/... FAILED//g' -e 's/... succeeded//g' ${LOG} +passed=`grep PASS: ${LOG}|wc -l` +failed=`grep FAIL: ${LOG}|wc -l` +all=$((passed + failed)) + +( echo "=== Test Summary ===" + echo "TOTAL: ${all}" + echo "PASSED: ${passed}" + echo "FAILED: ${failed}" +) | tee -a /${LOG} diff --git a/poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb index a4e3285cd..b565fd093 100644 --- a/poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb +++ b/poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb @@ -121,10 +121,10 @@ ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" ALTERNATIVE_PRIORITY[hostname.1] = "10" python __anonymous() { - for prog in d.getVar('base_sbindir_progs').split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir'), prog)) - for prog in d.getVar('base_bindir_progs').split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) + for prog in d.getVar('base_sbindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir'), prog)) + for prog in d.getVar('base_bindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) } ALTERNATIVE_PRIORITY = "100" diff --git a/poky/meta/recipes-graphics/piglit/piglit_git.bb b/poky/meta/recipes-graphics/piglit/piglit_git.bb index 9e4575164..1f7c6f960 100644 --- a/poky/meta/recipes-graphics/piglit/piglit_git.bb +++ b/poky/meta/recipes-graphics/piglit/piglit_git.bb @@ -43,7 +43,7 @@ do_configure_prepend() { OECMAKE_TARGET_INSTALL = "install/strip" -RDEPENDS_${PN} = "waffle python3 python3-mako python3-json \ +RDEPENDS_${PN} = "waffle waffle-bin python3 python3-mako python3-json \ python3-misc \ python3-unixadmin python3-xml python3-multiprocessing \ python3-six python3-shell python3-io \ diff --git a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index 2525545bd..ef8bae9f0 100644 --- a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -122,7 +122,7 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=36ef3e9887bb8b38ff265c602de6740e \ + file://WHENCE;md5=cecb9bd279516f42a589647557e806f2 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -188,7 +188,7 @@ NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" NO_GENERIC_LICENSE[WHENCE] = "WHENCE" -SRCREV = "44d4fca9922a252a0bd81f6307bcc072a78da54a" +SRCREV = "1baa34868b2c0a004dc595b20678145e3fff83e7" PE = "1" PV = "0.0+git${SRCPV}" @@ -237,7 +237,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-marvell-license ${PN}-pcie8897 ${PN}-pcie8997 \ ${PN}-sd8686 ${PN}-sd8688 ${PN}-sd8787 ${PN}-sd8797 ${PN}-sd8801 ${PN}-sd8887 ${PN}-sd8897 \ ${PN}-usb8997 \ - ${PN}-ti-connectivity-license ${PN}-wl12xx ${PN}-wl18xx \ + ${PN}-ti-connectivity-license ${PN}-wlcommon ${PN}-wl12xx ${PN}-wl18xx \ ${PN}-vt6656-license ${PN}-vt6656 \ ${PN}-rtl-license ${PN}-rtl8188 ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su ${PN}-rtl8723 ${PN}-rtl8821 \ ${PN}-rtl8168 \ @@ -521,24 +521,27 @@ RDEPENDS_${PN}-rtl8821 += "${PN}-rtl-license" RDEPENDS_${PN}-rtl8168 += "${PN}-whence-license" # For ti-connectivity +LICENSE_${PN}-wlcommon = "Firmware-ti-connectivity" LICENSE_${PN}-wl12xx = "Firmware-ti-connectivity" LICENSE_${PN}-wl18xx = "Firmware-ti-connectivity" LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity" FILES_${PN}-ti-connectivity-license = "${nonarch_base_libdir}/firmware/LICENCE.ti-connectivity" +FILES_${PN}-wlcommon = " \ + ${nonarch_base_libdir}/firmware/TI* \ + ${nonarch_base_libdir}/firmware/ti-connectivity/TI* \ +" FILES_${PN}-wl12xx = " \ ${nonarch_base_libdir}/firmware/wl12* \ - ${nonarch_base_libdir}/firmware/TI* \ - ${nonarch_base_libdir}/firmware/ti-connectivity \ + ${nonarch_base_libdir}/firmware/ti-connectivity/wl12* \ " FILES_${PN}-wl18xx = " \ ${nonarch_base_libdir}/firmware/wl18* \ - ${nonarch_base_libdir}/firmware/TI* \ - ${nonarch_base_libdir}/firmware/ti-connectivity \ + ${nonarch_base_libdir}/firmware/ti-connectivity/wl18* \ " -RDEPENDS_${PN}-wl12xx = "${PN}-ti-connectivity-license" -RDEPENDS_${PN}-wl18xx = "${PN}-ti-connectivity-license" +RDEPENDS_${PN}-wl12xx = "${PN}-ti-connectivity-license ${PN}-wlcommon" +RDEPENDS_${PN}-wl18xx = "${PN}-ti-connectivity-license ${PN}-wlcommon" # For vt6656 LICENSE_${PN}-vt6656 = "Firmware-via_vt6656" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb index d6d37ed31..4189fc8d1 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "eafe398ca1404953c2a01559c83d3a983f8717b1" -SRCREV_meta ?= "3435617380af107e31ec4e36173b9cf1f8a371a0" +SRCREV_machine ?= "82ac7b2b8048b537481bf16b8acda1cc9bfe9565" +SRCREV_meta ?= "6a3254e7b370cbb86c1f73379dcf38885c1c69e0" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.14.76" +LINUX_VERSION ?= "4.14.79" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb index f77de3a05..bc28e1c02 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "8e00c30ce22f378ecb7f243b1df3d209b8ee29bc" -SRCREV_meta ?= "bf98e195a4cf2404a064056b3593e83a7de84f25" +SRCREV_machine ?= "6228ee37a46479d624e608c572d241f74eee11b6" +SRCREV_meta ?= "8f4a98c93851f7f83d796aae2871df2798b8d917" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.18.14" +LINUX_VERSION ?= "4.18.21" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb index d613ff05f..71f5c4716 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb @@ -1,10 +1,10 @@ -KBRANCH ?= "v4.14/standard/tiny/common-pc" +KBRANCH ?= "v4.14/standard/tiny/base" LINUX_KERNEL_TYPE = "tiny" KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.14.76" +LINUX_VERSION ?= "4.14.79" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" @@ -12,8 +12,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "c5aca000e387da12ce375251c829f653503d32b4" -SRCREV_meta ?= "3435617380af107e31ec4e36173b9cf1f8a371a0" +SRCREV_machine ?= "6ce17eae5d962b30846a5258956246438d68d60a" +SRCREV_meta ?= "6a3254e7b370cbb86c1f73379dcf38885c1c69e0" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb index 591d41bd1..b2ca26498 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb @@ -1,10 +1,12 @@ -KBRANCH ?= "v4.18/standard/tiny/common-pc" +KBRANCH ?= "v4.18/standard/tiny/base" +KBRANCH_qemuarm ?= "v4.15/standard/tiny/arm-versatile-926ejs" + LINUX_KERNEL_TYPE = "tiny" KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.18.14" +LINUX_VERSION ?= "4.18.21" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -13,15 +15,16 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "33859b3077c83d8a024946ba06a59990546fcbc7" -SRCREV_meta ?= "bf98e195a4cf2404a064056b3593e83a7de84f25" +SRCREV_machine_qemuarm ?= "bd4312baf01b5aca2745245c3856b5143bf0c6ad" +SRCREV_machine ?= "9eddc793f95f4e7e283996a007e205622c633539" +SRCREV_meta ?= "8f4a98c93851f7f83d796aae2871df2798b8d917" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}" -COMPATIBLE_MACHINE = "qemux86|qemux86-64" +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm" # Functionality flags KERNEL_FEATURES = "" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_4.14.bb b/poky/meta/recipes-kernel/linux/linux-yocto_4.14.bb index cb4a66b71..65b244409 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_4.14.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_4.14.bb @@ -11,20 +11,20 @@ KBRANCH_qemux86 ?= "v4.14/standard/base" KBRANCH_qemux86-64 ?= "v4.14/standard/base" KBRANCH_qemumips64 ?= "v4.14/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "91251c7c3d5e9ba9bb527130db440c00bec30fe6" -SRCREV_machine_qemuarm64 ?= "72e2b6e07170fd84a93469830c69c31c9fa1c1dd" -SRCREV_machine_qemumips ?= "fe1a03895bd26473b6e60e76ed54d021561374a7" -SRCREV_machine_qemuppc ?= "e1d81834af552e5caf6c968d2f755866cee19d4e" -SRCREV_machine_qemux86 ?= "2c5caa7e84311f2a0097974a697ac1f59030530e" -SRCREV_machine_qemux86-64 ?= "2c5caa7e84311f2a0097974a697ac1f59030530e" -SRCREV_machine_qemumips64 ?= "512b0a8df98e49746548444cc4c9543ef0c23369" -SRCREV_machine ?= "2c5caa7e84311f2a0097974a697ac1f59030530e" -SRCREV_meta ?= "3435617380af107e31ec4e36173b9cf1f8a371a0" +SRCREV_machine_qemuarm ?= "8752b8421efe8b5a478f17fbffacf4af974ec703" +SRCREV_machine_qemuarm64 ?= "ac66474ba7f7e93d16ae3ea005f214113bb127c5" +SRCREV_machine_qemumips ?= "ab031b267e2a79fcd48da5d10d503f4d065f4821" +SRCREV_machine_qemuppc ?= "f47c3945e8dd230ea37771bcacc836245fc79d22" +SRCREV_machine_qemux86 ?= "f1d93b219bde37a8a286cd18d6af2dcf0d02c1a8" +SRCREV_machine_qemux86-64 ?= "f1d93b219bde37a8a286cd18d6af2dcf0d02c1a8" +SRCREV_machine_qemumips64 ?= "8063a7258fc670a361fed85b858fabb237485f1c" +SRCREV_machine ?= "f1d93b219bde37a8a286cd18d6af2dcf0d02c1a8" +SRCREV_meta ?= "6a3254e7b370cbb86c1f73379dcf38885c1c69e0" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.14.76" +LINUX_VERSION ?= "4.14.79" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_4.18.bb b/poky/meta/recipes-kernel/linux/linux-yocto_4.18.bb index 81160ca50..96c89723e 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_4.18.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_4.18.bb @@ -11,21 +11,21 @@ KBRANCH_qemux86 ?= "v4.18/standard/base" KBRANCH_qemux86-64 ?= "v4.18/standard/base" KBRANCH_qemumips64 ?= "v4.18/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "0573ed3c737c82b24fd661cc5ea961cac07ea2fe" -SRCREV_machine_qemuarm64 ?= "33859b3077c83d8a024946ba06a59990546fcbc7" -SRCREV_machine_qemumips ?= "465252ba0ec00ae10397cb4623c3d77c89e542a5" -SRCREV_machine_qemuppc ?= "33859b3077c83d8a024946ba06a59990546fcbc7" -SRCREV_machine_qemux86 ?= "33859b3077c83d8a024946ba06a59990546fcbc7" -SRCREV_machine_qemux86-64 ?= "33859b3077c83d8a024946ba06a59990546fcbc7" -SRCREV_machine_qemumips64 ?= "6d91dc62811f4688efc67845185858645b4ccfb8" -SRCREV_machine ?= "33859b3077c83d8a024946ba06a59990546fcbc7" -SRCREV_meta ?= "bf98e195a4cf2404a064056b3593e83a7de84f25" +SRCREV_machine_qemuarm ?= "bd83f95a7aa1aa180dad74dbdd6809ee9a5fe9e0" +SRCREV_machine_qemuarm64 ?= "9eddc793f95f4e7e283996a007e205622c633539" +SRCREV_machine_qemumips ?= "9a16770a65e7617b99f31663b1fafceb459df3dc" +SRCREV_machine_qemuppc ?= "9eddc793f95f4e7e283996a007e205622c633539" +SRCREV_machine_qemux86 ?= "9eddc793f95f4e7e283996a007e205622c633539" +SRCREV_machine_qemux86-64 ?= "9eddc793f95f4e7e283996a007e205622c633539" +SRCREV_machine_qemumips64 ?= "6641acbf076ba3f7ad96e846581272215a537904" +SRCREV_machine ?= "9eddc793f95f4e7e283996a007e205622c633539" +SRCREV_meta ?= "8f4a98c93851f7f83d796aae2871df2798b8d917" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.18.14" +LINUX_VERSION ?= "4.18.21" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" diff --git a/poky/meta/recipes-multimedia/gstreamer/gst-validate_1.14.2.bb b/poky/meta/recipes-multimedia/gstreamer/gst-validate_1.14.4.bb index f4438dc5a..a4b3b465c 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gst-validate_1.14.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gst-validate_1.14.4.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "https://gstreamer.freedesktop.org/src/${BPN}/${BP}.tar.xz \ file://0001-connect-has-a-different-signature-on-musl.patch \ " -SRC_URI[md5sum] = "f334102b0e706008505d00f7f5b5e023" -SRC_URI[sha256sum] = "ea9e423e5470ef85ef8a0aea1714e7abfc49deb2ed282057367484cdeba6f19f" +SRC_URI[md5sum] = "1f4fc5308695adfdc11d13046aa4888c" +SRC_URI[sha256sum] = "18dccca94bdc0bab3cddb07817bd280df7ab4abbec9a83b92620367a22d955c7" DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" RRECOMMENDS_${PN} = "git" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.4.bb index 718db17d0..5c9c372f0 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.4.bb @@ -19,8 +19,8 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz file://0001-configure-check-for-armv7ve-variant.patch \ file://0001-fix-host-contamination.patch \ " -SRC_URI[md5sum] = "da3d4655268bc6766a261065ca737590" -SRC_URI[sha256sum] = "8a351c39c5cfc2bbd31ca434ec4a290a730a26efbdea962fdd8306dce5c576de" +SRC_URI[md5sum] = "58342db11dbb201a66a62577dcf7bab5" +SRC_URI[sha256sum] = "dfd78591901df7853eab7e56a86c34a1b03635da0d3d56b89aa577f1897865da" S = "${WORKDIR}/gst-libav-${PV}" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.4.bb index 3f7bc8f0f..39ca1e385 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.4.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SRC_URI = "http://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" -SRC_URI[md5sum] = "d4fc97e3516befe04be3d1665a6f7bbe" -SRC_URI[sha256sum] = "316dbb13693795383cad6ec4dbebd94a869cd1f9d59a393686cad0b77bf9b5a9" +SRC_URI[md5sum] = "81e67ea03be607b7c548ce911598d754" +SRC_URI[sha256sum] = "969870e75c1f75c96f8783530e2c2932fc3afbfd976eb0c466f51dae268ea3d4" S = "${WORKDIR}/gst-omx-${PV}" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.4.bb index 39546b846..8c7c235fd 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.4.bb @@ -9,8 +9,8 @@ SRC_URI = " \ file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ " -SRC_URI[md5sum] = "76826c564bed5511982d7fb6137d9875" -SRC_URI[sha256sum] = "34fab7da70994465a64468330b2168a4a0ed90a7de7e4c499b6d127c6c1b1eaf" +SRC_URI[md5sum] = "5d20a91d027708abcf924f6c1279dd25" +SRC_URI[sha256sum] = "910b4e0e2e897e8b6d06767af1779d70057c309f67292f485ff988d087aa0de5" S = "${WORKDIR}/gst-plugins-bad-${PV}" @@ -55,6 +55,7 @@ PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms" PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2" PACKAGECONFIG[lcms2] = "--enable-lcms2,--disable-lcms2,lcms" PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" +PACKAGECONFIG[msdk] = "--enable-msdk,--disable-msdk,intel-mediasdk" PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon" PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" @@ -85,7 +86,7 @@ PACKAGECONFIG[webrtcdsp] = "--enable-webrtcdsp,--disable-webrtcdsp,webrtc- # these plugins have no corresponding library in OE-core or meta-openembedded: # openni2 winks direct3d directsound winscreencap acm apple_media iqa # android_media avc bs2b chromaprint daala dts fdkaac gme gsm kate ladspa -# lv2 mpeg2enc mplex msdk musepack nvenc ofa opensles soundtouch +# lv2 mpeg2enc mplex musepack nvenc ofa opensles soundtouch # spandsp spc teletextdec vdpau wasapi x265 zbar EXTRA_OECONF += " \ @@ -116,7 +117,6 @@ EXTRA_OECONF += " \ --disable-lv2 \ --disable-mpeg2enc \ --disable-mplex \ - --disable-msdk \ --disable-musepack \ --disable-nvenc \ --disable-ofa \ diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.4.bb index dcea78919..12c9bbce9 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.4.bb @@ -21,8 +21,8 @@ SRC_URI = " \ file://0011-gl-Add-switches-for-explicitely-enabling-disabling-P.patch \ file://link-with-libvchostif.patch \ " -SRC_URI[md5sum] = "8bc790d623350cd8eac68d3a13d79f7d" -SRC_URI[sha256sum] = "a4b7e80ba869f599307449b17c9e00b5d1e94d3ba1d8a1a386b8770b2ef01c7c" +SRC_URI[md5sum] = "4dbe20c1bf44191c2b8833234df5cb2a" +SRC_URI[sha256sum] = "ca6139490e48863e7706d870ff4e8ac9f417b56f3b9e4b3ce490c13b09a77461" S = "${WORKDIR}/gst-plugins-base-${PV}" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.4.bb index e035cc0cb..830660579 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.4.bb @@ -8,8 +8,8 @@ SRC_URI = " \ file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ " -SRC_URI[md5sum] = "5b83b2828e31ce5b4a5c03c71e707ae7" -SRC_URI[sha256sum] = "c0575e2811860bfff59b865b8d125153859a01f0615fa41e279b64d88d25caad" +SRC_URI[md5sum] = "6e3b247097366cf2639f22abfece7113" +SRC_URI[sha256sum] = "5f8b553260cb0aac56890053d8511db1528d53cae10f0287cfce2cb2acc70979" S = "${WORKDIR}/gst-plugins-good-${PV}" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.4.bb index 019726946..c59ba1de5 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.4.bb @@ -10,8 +10,8 @@ SRC_URI = " \ http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ " -SRC_URI[md5sum] = "ea0a800c6421c3c3cdbed3d040b8ffd3" -SRC_URI[sha256sum] = "55e097d9d93921fdcf7abb0ff92d23b21dd9098e632f1ba433603b3bd1cf3d69" +SRC_URI[md5sum] = "90768a0074db071175ce980064d9a1ac" +SRC_URI[sha256sum] = "ac02d837f166c35ff6ce0738e281680d0b90052cfb1f0255dcf6aaca5f0f6d23" S = "${WORKDIR}/gst-plugins-ugly-${PV}" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.14.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.14.4.bb index 78c004632..8d45ca266 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.14.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.14.4.bb @@ -6,8 +6,8 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" SRC_URI = "http://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[md5sum] = "5b0af1bd490d79a7d435b2be47568f8e" -SRC_URI[sha256sum] = "dc40be5ab4f1a433ff3f0af2b3d2d79a363009020c41ec10f9747ba64200cb22" +SRC_URI[md5sum] = "d4c0e3915f547feef49208ee08981e5a" +SRC_URI[sha256sum] = "d0fdb24f93b6d889f309d2f526b8ea9577e0084ff0a62b4623ef1aed52e85a1b" DEPENDS = "gstreamer1.0 python3-pygobject" RDEPENDS_${PN} += "gstreamer1.0 python3-pygobject" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.4.bb index 6766e252e..7efc1b353 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.4.bb @@ -14,8 +14,8 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz file://gtk-doc-tweaks.patch \ " -SRC_URI[md5sum] = "c26b59dd2ea8b1a4a25e9f7e0f57a50e" -SRC_URI[sha256sum] = "f7387755cf6ac5f334d4610f1f5aa7da4ff396a487dd5b789bb707f160222c98" +SRC_URI[md5sum] = "ab0fb5c829266a500e14b46b7bdf06bf" +SRC_URI[sha256sum] = "3d0ece2afdcd601c175ece24e32a30bc19247b454f4eafd3deeec2533c6884f1" S = "${WORKDIR}/${PNREAL}-${PV}" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.4.bb index f0ed2fa86..389643410 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.4.bb @@ -13,8 +13,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.x file://0001-vaapsink-downgrade-to-marginal.patch \ " -SRC_URI[md5sum] = "12ee9c16dfa0bb1808c76683e1c9a328" -SRC_URI[sha256sum] = "7f1064e27f5abd3a42ef66b425f1a2b9dbae7748c81bd9d090ce52a1aaf30d8a" +SRC_URI[md5sum] = "2fae3442f5f23e7354a0c592bc7b9065" +SRC_URI[sha256sum] = "ce18dbfe961c6a8d31270231686075586bf7a7df62b778c8e7f5ec148251d0a3" S = "${WORKDIR}/${REALPN}-${PV}" DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.2.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.4.bb index 3a6e53de0..232234b88 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.2.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.4.bb @@ -27,8 +27,8 @@ SRC_URI = " \ file://add-a-target-to-compile-tests.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "9f4177c1752e44cbd72f6311ee61e1ba" -SRC_URI[sha256sum] = "4bd6127299f3f29379046bbd58a526e6353b569e0e72f7b4df2ae70df6882e09" +SRC_URI[md5sum] = "f67fbbc42bd85a0701df119f52fb52bd" +SRC_URI[sha256sum] = "f94f6696c5f05a3b3a9183e39c5f5c0b779f75a04c0efa497e7920afa985ffc7" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ " diff --git a/poky/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch b/poky/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch deleted file mode 100644 index c2ac49e58..000000000 --- a/poky/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c99f798407e44c86e9f64f5b1adf3b4d0549eef2 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <Mingli.Yu@windriver.com> -Date: Fri, 15 Jun 2018 16:21:56 +0800 -Subject: [PATCH] make_x86_64_sysv_elf_gas.S: set .file section - -Set .file section explicitly for .S files to avoid -the linker introduces the host path in symbols for -object files whose source file is .S -Otherwise, there is a host path in the symbols as below: -$ readelf --wide --symbols /my-build/boost/1.67.0-r0/boost_1_67_0/x86_64-poky-linux/boost/bin.v2/libs/context/build/aca09349fdb84d131321425f6c3a38ed/libboost_context.so.1.67.0 - -42: 0000000000000000 0 FILE LOCAL DEFAULT ABS /my-build/boost/1.67.0-r0/boost_1_67_0/x86_64-poky-linux/boost/bin.v2/libs/context/build/aca09349fdb84d131321425f6c3a38ed/asm/make_x86_64_sysv_elf_gas.o - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> ---- - libs/context/src/asm/make_i386_sysv_elf_gas.S | 1 + - libs/context/src/asm/make_x86_64_sysv_elf_gas.S | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/libs/context/src/asm/make_i386_sysv_elf_gas.S b/libs/context/src/asm/make_i386_sysv_elf_gas.S -index de77e88..b76de26 100644 ---- a/libs/context/src/asm/make_i386_sysv_elf_gas.S -+++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S -@@ -24,6 +24,7 @@ - * * - ****************************************************************************************/ - -+.file "make_i386_sysv_elf_gas.S" - .text - .globl make_fcontext - .align 2 -diff --git a/libs/context/src/asm/make_x86_64_sysv_elf_gas.S b/libs/context/src/asm/make_x86_64_sysv_elf_gas.S -index 25a0c00..0ef3756 100644 ---- a/libs/context/src/asm/make_x86_64_sysv_elf_gas.S -+++ b/libs/context/src/asm/make_x86_64_sysv_elf_gas.S -@@ -24,6 +24,7 @@ - * * - ****************************************************************************************/ - -+.file "make_x86_64_sysv_elf_gas.S" - .text - .globl make_fcontext - .type make_fcontext,@function --- -2.7.4 - diff --git a/poky/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch b/poky/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch new file mode 100644 index 000000000..155653316 --- /dev/null +++ b/poky/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch @@ -0,0 +1,243 @@ +Author: Douglas Royds <douglas.royds@taitradio.com> +Date: Thu Nov 22 09:34:22 2018 +1300 + +Add a .file directive explicitly for all *_elf_gas.S files to prevent the linker +adding a host build-system path as a FILE symbol to the object file. + +This replaces the existing patch that added the .file directive to a small +subset of these files. + +Upstream-Status: Submitted [https://github.com/boostorg/context/issues/91] +Signed-off-by: Douglas Royds <douglas.royds@taitradio.com> + +diff -ur boost_1_68_0.original/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 ++++ boost_1_68_0/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S 2018-11-22 09:04:27.900876941 +1300 +@@ -51,6 +51,7 @@ + * * + *******************************************************/ + ++.file "jump_arm64_aapcs_elf_gas.S" + .text + .align 2 + .global jump_fcontext +diff -ur boost_1_68_0.original/libs/context/src/asm/jump_arm_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_arm_aapcs_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/jump_arm_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 ++++ boost_1_68_0/libs/context/src/asm/jump_arm_aapcs_elf_gas.S 2018-11-22 09:04:28.876898240 +1300 +@@ -38,6 +38,7 @@ + * * + *******************************************************/ + ++.file "jump_arm_aapcs_elf_gas.S" + .text + .globl jump_fcontext + .align 2 +diff -ur boost_1_68_0.original/libs/context/src/asm/jump_i386_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_i386_sysv_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/jump_i386_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 ++++ boost_1_68_0/libs/context/src/asm/jump_i386_sysv_elf_gas.S 2018-11-22 09:04:29.904920674 +1300 +@@ -24,6 +24,7 @@ + * * + ****************************************************************************************/ + ++.file "jump_i386_sysv_elf_gas.S" + .text + .globl jump_fcontext + .align 2 +diff -ur boost_1_68_0.original/libs/context/src/asm/jump_mips32_o32_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_mips32_o32_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/jump_mips32_o32_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 ++++ boost_1_68_0/libs/context/src/asm/jump_mips32_o32_elf_gas.S 2018-11-22 09:04:41.021163195 +1300 +@@ -38,6 +38,7 @@ + * * + * *****************************************************/ + ++.file "jump_mips32_o32_elf_gas.S" + .text + .globl jump_fcontext + .align 2 +diff -ur boost_1_68_0.original/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 ++++ boost_1_68_0/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S 2018-11-22 09:04:42.281190679 +1300 +@@ -73,6 +73,7 @@ + * * + *******************************************************/ + ++.file "jump_ppc32_sysv_elf_gas.S" + .text + .globl jump_fcontext + .align 2 +diff -ur boost_1_68_0.original/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 ++++ boost_1_68_0/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S 2018-11-22 09:04:43.193210571 +1300 +@@ -66,6 +66,7 @@ + * * + *******************************************************/ + ++.file "jump_ppc64_sysv_elf_gas.S" + .globl jump_fcontext + #if _CALL_ELF == 2 + .text +diff -ur boost_1_68_0.original/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 ++++ boost_1_68_0/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S 2018-11-22 09:04:44.213232818 +1300 +@@ -24,6 +24,7 @@ + * * + ****************************************************************************************/ + ++.file "jump_x86_64_sysv_elf_gas.S" + .text + .globl jump_fcontext + .type jump_fcontext,@function +diff -ur boost_1_68_0.original/libs/context/src/asm/make_arm64_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/make_arm64_aapcs_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/make_arm64_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 ++++ boost_1_68_0/libs/context/src/asm/make_arm64_aapcs_elf_gas.S 2018-11-22 09:04:45.153253319 +1300 +@@ -51,6 +51,7 @@ + * * + *******************************************************/ + ++.file "make_arm64_aapcs_elf_gas.S" + .text + .align 2 + .global make_fcontext +diff -ur boost_1_68_0.original/libs/context/src/asm/make_arm_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/make_arm_aapcs_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/make_arm_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 ++++ boost_1_68_0/libs/context/src/asm/make_arm_aapcs_elf_gas.S 2018-11-22 09:04:46.097273908 +1300 +@@ -38,6 +38,7 @@ + * * + *******************************************************/ + ++.file "make_arm_aapcs_elf_gas.S" + .text + .globl make_fcontext + .align 2 +diff -ur boost_1_68_0.original/libs/context/src/asm/make_i386_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/make_i386_sysv_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/make_i386_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 ++++ boost_1_68_0/libs/context/src/asm/make_i386_sysv_elf_gas.S 2018-11-22 09:04:46.973293012 +1300 +@@ -24,6 +24,7 @@ + * * + ****************************************************************************************/ + ++.file "make_i386_sysv_elf_gas.S" + .text + .globl make_fcontext + .align 2 +diff -ur boost_1_68_0.original/libs/context/src/asm/make_mips32_o32_elf_gas.S boost_1_68_0/libs/context/src/asm/make_mips32_o32_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/make_mips32_o32_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 ++++ boost_1_68_0/libs/context/src/asm/make_mips32_o32_elf_gas.S 2018-11-22 09:04:47.925313772 +1300 +@@ -38,6 +38,7 @@ + * * + * *****************************************************/ + ++.file "make_mips32_o32_elf_gas.S" + .text + .globl make_fcontext + .align 2 +diff -ur boost_1_68_0.original/libs/context/src/asm/make_ppc32_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/make_ppc32_sysv_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/make_ppc32_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 ++++ boost_1_68_0/libs/context/src/asm/make_ppc32_sysv_elf_gas.S 2018-11-22 09:04:48.865334271 +1300 +@@ -73,6 +73,7 @@ + * * + *******************************************************/ + ++.file "make_ppc32_sysv_elf_gas.S" + .text + .globl make_fcontext + .align 2 +diff -ur boost_1_68_0.original/libs/context/src/asm/make_ppc64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/make_ppc64_sysv_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/make_ppc64_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 ++++ boost_1_68_0/libs/context/src/asm/make_ppc64_sysv_elf_gas.S 2018-11-22 09:04:50.049360089 +1300 +@@ -66,6 +66,7 @@ + * * + *******************************************************/ + ++.file "make_ppc64_sysv_elf_gas.S" + .globl make_fcontext + #if _CALL_ELF == 2 + .text +diff -ur boost_1_68_0.original/libs/context/src/asm/make_x86_64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/make_x86_64_sysv_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/make_x86_64_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 ++++ boost_1_68_0/libs/context/src/asm/make_x86_64_sysv_elf_gas.S 2018-11-22 09:04:51.117383378 +1300 +@@ -24,6 +24,7 @@ + * * + ****************************************************************************************/ + ++.file "make_x86_64_sysv_elf_gas.S" + .text + .globl make_fcontext + .type make_fcontext,@function +diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 ++++ boost_1_68_0/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S 2018-11-22 09:04:52.201407013 +1300 +@@ -51,6 +51,7 @@ + * * + *******************************************************/ + ++.file "ontop_arm64_aapcs_elf_gas.S" + .text + .align 2 + .global ontop_fcontext +diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 ++++ boost_1_68_0/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S 2018-11-22 09:04:53.269430300 +1300 +@@ -38,6 +38,7 @@ + * * + *******************************************************/ + ++.file "ontop_arm_aapcs_elf_gas.S" + .text + .globl ontop_fcontext + .align 2 +diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_i386_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_i386_sysv_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/ontop_i386_sysv_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 ++++ boost_1_68_0/libs/context/src/asm/ontop_i386_sysv_elf_gas.S 2018-11-22 09:04:54.389454719 +1300 +@@ -24,6 +24,7 @@ + * * + ****************************************************************************************/ + ++.file "ontop_i386_sysv_elf_gas.S" + .text + .globl ontop_fcontext + .align 2 +diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_mips32_o32_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_mips32_o32_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/ontop_mips32_o32_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 ++++ boost_1_68_0/libs/context/src/asm/ontop_mips32_o32_elf_gas.S 2018-11-22 09:04:55.657482363 +1300 +@@ -38,6 +38,7 @@ + * * + * *****************************************************/ + ++.file "ontop_mips32_o32_elf_gas.S" + .text + .globl ontop_fcontext + .align 2 +diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 ++++ boost_1_68_0/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S 2018-11-22 09:04:56.777506781 +1300 +@@ -73,6 +73,7 @@ + * * + *******************************************************/ + ++.file "ontop_ppc32_sysv_elf_gas.S" + .text + .globl ontop_fcontext + .align 2 +diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 ++++ boost_1_68_0/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S 2018-11-22 09:04:58.485544015 +1300 +@@ -66,6 +66,7 @@ + * * + *******************************************************/ + ++.file "ontop_ppc64_sysv_elf_gas.S" + .globl ontop_fcontext + #if _CALL_ELF == 2 + .text +diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 ++++ boost_1_68_0/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S 2018-11-22 09:04:59.609568516 +1300 +@@ -24,6 +24,7 @@ + * * + ****************************************************************************************/ + ++.file "ontop_x86_64_sysv_elf_gas.S" + .text + .globl ontop_fcontext + .type ontop_fcontext,@function diff --git a/poky/meta/recipes-support/boost/boost_1.68.0.bb b/poky/meta/recipes-support/boost/boost_1.68.0.bb index c7958a4c5..82e36fd73 100644 --- a/poky/meta/recipes-support/boost/boost_1.68.0.bb +++ b/poky/meta/recipes-support/boost/boost_1.68.0.bb @@ -7,5 +7,5 @@ SRC_URI += "\ file://boost-math-disable-pch-for-gcc.patch \ file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ - file://0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch \ + file://reproducibility-add-file-directive-to-assembler.patch \ " diff --git a/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch index 5f1dd30f8..ab0b6dccc 100644 --- a/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch +++ b/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch @@ -1,4 +1,4 @@ -From 7eb7efb9ce89c66e14c194773c4dcf6478a6ca4d Mon Sep 17 00:00:00 2001 +From 5f38f1276a3651c30bddc508122da2e7d2d3ca92 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 22 Jan 2018 18:00:21 +0200 Subject: [PATCH] configure.ac: use a custom value for the location of @@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 59a2e60..12d390b 100644 +index 8c80377..a66d393 100644 --- a/configure.ac +++ b/configure.ac @@ -1841,7 +1841,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", diff --git a/poky/meta/recipes-support/gnupg/gnupg/relocate.patch b/poky/meta/recipes-support/gnupg/gnupg/relocate.patch index 87ec409ca..860f7f1d9 100644 --- a/poky/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/poky/meta/recipes-support/gnupg/gnupg/relocate.patch @@ -1,10 +1,18 @@ -Allow the environment to override where gnupg looks for its own files. Useful in native builds. +From 1eaf630343cc77d8b5d41d0b0a3551fa193c5fcf Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Wed, 19 Sep 2018 14:44:40 +0100 +Subject: [PATCH] Allow the environment to override where gnupg looks for its + own files. Useful in native builds. Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Ross Burton <ross.burton@intel.com> +--- + common/homedir.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + diff --git a/common/homedir.c b/common/homedir.c -index e9e75d01e..19140aa0d 100644 +index e9e75d0..19140aa 100644 --- a/common/homedir.c +++ b/common/homedir.c @@ -760,7 +760,7 @@ gnupg_socketdir (void) diff --git a/poky/meta/recipes-support/gnupg/gnupg_2.2.9.bb b/poky/meta/recipes-support/gnupg/gnupg_2.2.11.bb index b7d23b8d3..d259ed532 100644 --- a/poky/meta/recipes-support/gnupg/gnupg_2.2.9.bb +++ b/poky/meta/recipes-support/gnupg/gnupg_2.2.11.bb @@ -19,8 +19,8 @@ SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for- file://relocate.patch" -SRC_URI[md5sum] = "52c895a81f514a65e08923736c38654a" -SRC_URI[sha256sum] = "6278eaabffa1ebc9fa2ceb3dc53eea9a1505ab02a668a86dd6fec06951af2164" +SRC_URI[md5sum] = "e23a896d634e8b81681314780f5158a4" +SRC_URI[sha256sum] = "496c3e123ef53f35436ddccca58e82acaa901ca4e21174e77386c0cea0c49cd9" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ diff --git a/poky/meta/recipes-support/gnutls/gnutls_3.6.3.bb b/poky/meta/recipes-support/gnutls/gnutls_3.6.4.bb index 441bbecf1..6d2a11df3 100644 --- a/poky/meta/recipes-support/gnutls/gnutls_3.6.3.bb +++ b/poky/meta/recipes-support/gnutls/gnutls_3.6.4.bb @@ -21,8 +21,8 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://arm_eabi.patch \ " -SRC_URI[md5sum] = "d3b1b05c2546b80832101a423a80faf8" -SRC_URI[sha256sum] = "ed642b66a4ecf4851ab2d809cd1475c297b6201d8e8bd14b4d1c08b53ffca993" +SRC_URI[md5sum] = "63363d1c00601f4d11a5cadc8b5e0799" +SRC_URI[sha256sum] = "c663a792fbc84349c27c36059181f2ca86c9442e75ee8b0ad72f5f9b35deab3a" inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc diff --git a/poky/meta/recipes-support/gnutls/libtasn1_4.13.bb b/poky/meta/recipes-support/gnutls/libtasn1_4.13.bb index 2d223861c..9ee191309 100644 --- a/poky/meta/recipes-support/gnutls/libtasn1_4.13.bb +++ b/poky/meta/recipes-support/gnutls/libtasn1_4.13.bb @@ -18,6 +18,6 @@ DEPENDS = "bison-native" SRC_URI[md5sum] = "ce2ba4d3088119b48e7531a703669c52" SRC_URI[sha256sum] = "7e528e8c317ddd156230c4e31d082cd13e7ddeb7a54824be82632209550c8cca" -inherit autotools texinfo binconfig lib_package gtk-doc +inherit autotools texinfo lib_package gtk-doc BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.3.bb b/poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb index cefa8365e..fda68a293 100644 --- a/poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.3.bb +++ b/poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb @@ -22,8 +22,8 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \ file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \ " -SRC_URI[md5sum] = "3139c2402e844985a67fb288a930534d" -SRC_URI[sha256sum] = "66ec90be036747602f2b48f98312361a9180c97c68a690a5f376fa0f67d0af7c" +SRC_URI[md5sum] = "fbfdaebbbc6d7e5fbbf6ffdb3e139573" +SRC_URI[sha256sum] = "f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227" BINCONFIG = "${bindir}/libgcrypt-config" diff --git a/poky/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch b/poky/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch new file mode 100644 index 000000000..90fe45f34 --- /dev/null +++ b/poky/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch @@ -0,0 +1,103 @@ +From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <Mingli.Yu@windriver.com> +Date: Fri, 16 Nov 2018 13:52:49 +0800 +Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME + +Remove _BUILD_STRING and _BUILD_TIME to avoid +adding timestamp to _pl_bld.h which can result +in adding timestamp in library file such as +libnspr4.so. + $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so + [snip] + 0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49 + [snip] + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> +--- + lib/ds/Makefile.in | 8 +------- + lib/libc/src/Makefile.in | 8 +------- + lib/prstreams/Makefile.in | 8 +------- + pr/src/Makefile.in | 8 +------- + 4 files changed, 4 insertions(+), 28 deletions(-) + +diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in +index e737791..b578476 100644 +--- a/lib/ds/Makefile.in ++++ b/lib/ds/Makefile.in +@@ -114,13 +114,7 @@ GARBAGE += $(TINC) + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) +diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in +index e8a6d9f..978ed28 100644 +--- a/lib/libc/src/Makefile.in ++++ b/lib/libc/src/Makefile.in +@@ -116,13 +116,7 @@ GARBAGE += $(TINC) + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) +diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in +index aeb2944..f318097 100644 +--- a/lib/prstreams/Makefile.in ++++ b/lib/prstreams/Makefile.in +@@ -116,13 +116,7 @@ endif + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) +diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in +index 19c5a69..b4ac31c 100644 +--- a/pr/src/Makefile.in ++++ b/pr/src/Makefile.in +@@ -326,13 +326,7 @@ GARBAGE += $(TINC) + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC) +-- +2.7.4 + diff --git a/poky/meta/recipes-support/nspr/nspr_4.19.bb b/poky/meta/recipes-support/nspr/nspr_4.19.bb index 0212be7f4..9263f688d 100644 --- a/poky/meta/recipes-support/nspr/nspr_4.19.bb +++ b/poky/meta/recipes-support/nspr/nspr_4.19.bb @@ -13,6 +13,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz file://0001-md-Fix-build-with-musl.patch \ file://0003-Add-type-definitions-for-the-RISC-V-architecture.patch \ file://0004-Add-ARC-support.patch \ + file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ file://nspr.pc.in \ " diff --git a/poky/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch b/poky/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch new file mode 100644 index 000000000..bb1c6e3b3 --- /dev/null +++ b/poky/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch @@ -0,0 +1,34 @@ +Subject: [PATCH] Fix SHA_HTONL bug for arm 32be. + +In arm 32be, there is no need to reverse the host value. + +Upstream-Status: Pending + +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +--- + lib/freebl/sha_fast.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/nss/lib/freebl/sha_fast.h b/nss/lib/freebl/sha_fast.h +index 4f37d13..8072eda 100644 +--- a/nss/lib/freebl/sha_fast.h ++++ b/nss/lib/freebl/sha_fast.h +@@ -99,6 +99,7 @@ swap4b(PRUint32 value) + defined(__ARM_ARCH_7__) || \ + defined(__ARM_ARCH_7A__) || \ + defined(__ARM_ARCH_7R__))) ++#if defined(IS_LITTLE_ENDIAN) + static __inline__ PRUint32 + swap4b(PRUint32 value) + { +@@ -109,6 +110,7 @@ swap4b(PRUint32 value) + return ret; + } + #define SHA_HTONL(x) swap4b(x) ++#endif + + #endif /* x86 family */ + +-- +2.7.4 + diff --git a/poky/meta/recipes-support/nss/nss_3.39.bb b/poky/meta/recipes-support/nss/nss_3.39.bb index cdc95c621..3a8e5d4b8 100644 --- a/poky/meta/recipes-support/nss/nss_3.39.bb +++ b/poky/meta/recipes-support/nss/nss_3.39.bb @@ -28,6 +28,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://blank-cert9.db \ file://blank-key4.db \ file://system-pkcs11.txt \ + file://nss-fix-SHA_HTONL-bug-for-arm-32be.patch \ " SRC_URI[md5sum] = "10720fc70fd483de1b085402fb10ed59" diff --git a/poky/scripts/contrib/patchreview.py b/poky/scripts/contrib/patchreview.py index a4d5ba686..072166504 100755 --- a/poky/scripts/contrib/patchreview.py +++ b/poky/scripts/contrib/patchreview.py @@ -5,6 +5,7 @@ # - test suite # - validate signed-off-by +status_values = ("accepted", "pending", "inappropriate", "backport", "submitted", "denied") class Result: # Whether the patch has an Upstream-Status or not @@ -35,25 +36,26 @@ def blame_patch(patch): "--format=%s (%aN <%aE>)", "--", patch)).decode("utf-8").splitlines() -def patchreview(patches): - import re +def patchreview(path, patches): + import re, os.path # General pattern: start of line, optional whitespace, tag with optional # hyphen or spaces, maybe a colon, some whitespace, then the value, all case # insensitive. sob_re = re.compile(r"^[\t ]*(Signed[-_ ]off[-_ ]by:?)[\t ]*(.+)", re.IGNORECASE | re.MULTILINE) status_re = re.compile(r"^[\t ]*(Upstream[-_ ]Status:?)[\t ]*(\w*)", re.IGNORECASE | re.MULTILINE) - status_values = ("accepted", "pending", "inappropriate", "backport", "submitted", "denied") cve_tag_re = re.compile(r"^[\t ]*(CVE:)[\t ]*(.*)", re.IGNORECASE | re.MULTILINE) cve_re = re.compile(r"cve-[0-9]{4}-[0-9]{4,6}", re.IGNORECASE) results = {} for patch in patches: + + fullpath = os.path.join(path, patch) result = Result() - results[patch] = result + results[fullpath] = result - content = open(patch, encoding='ascii', errors='ignore').read() + content = open(fullpath, encoding='ascii', errors='ignore').read() # Find the Signed-off-by tag match = sob_re.search(content) @@ -122,6 +124,8 @@ def analyse(results, want_blame=False, verbose=True): missing_status += 1 if r.malformed_upstream_status or r.unknown_upstream_status: malformed_status += 1 + # Count patches with no status as pending + pending_patches +=1 if r.missing_cve: missing_cve += 1 if r.upstream_status == "pending": @@ -132,7 +136,6 @@ def analyse(results, want_blame=False, verbose=True): need_blame = True if verbose: print("Missing Signed-off-by tag (%s)" % patch) - if r.malformed_sob: need_blame = True if verbose: @@ -198,14 +201,35 @@ if __name__ == "__main__": args.add_argument("-b", "--blame", action="store_true", help="show blame for malformed patches") args.add_argument("-v", "--verbose", action="store_true", help="show per-patch results") args.add_argument("-g", "--histogram", action="store_true", help="show patch histogram") - args.add_argument("directory", nargs="?", help="directory to scan") + args.add_argument("-j", "--json", help="update JSON") + args.add_argument("directory", help="directory to scan") args = args.parse_args() - if args.directory: - os.chdir(args.directory) - patches = subprocess.check_output(("git", "ls-files", "recipes-*/**/*.patch", "recipes-*/**/*.diff")).decode("utf-8").split() - results = patchreview(patches) + patches = subprocess.check_output(("git", "-C", args.directory, "ls-files", "recipes-*/**/*.patch", "recipes-*/**/*.diff")).decode("utf-8").split() + results = patchreview(args.directory, patches) analyse(results, want_blame=args.blame, verbose=args.verbose) + + if args.json: + import json, os.path, collections + if os.path.isfile(args.json): + data = json.load(open(args.json)) + else: + data = [] + + row = collections.Counter() + row["total"] = len(results) + row["date"] = subprocess.check_output(["git", "-C", args.directory, "show", "-s", "--pretty=format:%cd", "--date=format:%s"]).decode("utf-8").strip() + for r in results.values(): + if r.upstream_status in status_values: + row[r.upstream_status] += 1 + if r.malformed_upstream_status or r.missing_upstream_status: + row['malformed-upstream-status'] += 1 + if r.malformed_sob or r.missing_sob: + row['malformed-sob'] += 1 + + data.append(row) + json.dump(data, open(args.json, "w")) + if args.histogram: print() histogram(results) diff --git a/poky/scripts/lib/devtool/deploy.py b/poky/scripts/lib/devtool/deploy.py index 52e261d56..886004b5d 100644 --- a/poky/scripts/lib/devtool/deploy.py +++ b/poky/scripts/lib/devtool/deploy.py @@ -184,7 +184,7 @@ def deploy(args, config, basepath, workspace): exec_fakeroot(rd, "cp -af %s %s" % (os.path.join(srcdir, '.'), recipe_outdir), shell=True) os.environ['PATH'] = ':'.join([os.environ['PATH'], rd.getVar('PATH') or '']) oe.package.strip_execs(args.recipename, recipe_outdir, rd.getVar('STRIP'), rd.getVar('libdir'), - rd.getVar('base_libdir')) + rd.getVar('base_libdir'), rd) filelist = [] ftotalsize = 0 diff --git a/poky/scripts/runqemu b/poky/scripts/runqemu index 295c8b1b6..08f4cfe4c 100755 --- a/poky/scripts/runqemu +++ b/poky/scripts/runqemu @@ -474,14 +474,11 @@ class BaseConfig(object): "Try 'runqemu help' on how to use it" % \ (unknown_arg, arg)) # Check to make sure it is a valid machine - if unknown_arg: - if self.get('MACHINE') == unknown_arg: - return + if unknown_arg and self.get('MACHINE') != unknown_arg: if self.get('DEPLOY_DIR_IMAGE'): machine = os.path.basename(self.get('DEPLOY_DIR_IMAGE')) if unknown_arg == machine: self.set("MACHINE", machine) - return self.check_arg_machine(unknown_arg) |
