diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-10 14:20:22 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-10 14:21:34 +0300 |
| commit | 79641f25e882b55af6a647cfc0bf6bcc025661a5 (patch) | |
| tree | 2b5fb3c59e5b6e85fd6fb8a94b6e15989d974336 /poky | |
| parent | 39ae1a1dce50fde698688fa5ac8eb737b302f0fd (diff) | |
| download | openbmc-79641f25e882b55af6a647cfc0bf6bcc025661a5.tar.xz | |
poky: subtree update:c17113f1e2..3b87508a9a
Adrian Bunk (18):
help2man: Upgrade 1.47.10 -> 1.47.11
glib-networking: Upgrade 2.60.2 -> 2.60.3
flac: Upgrade 1.3.2 -> 1.3.3
subversion: Upgrade 1.12.0 -> 1.12.2
world-broken.inc: Remove
meta/recipes.txt: Stop documenting the long removed recipes-lsb4
python: Remove PYTHONLSBOPTS that hasn't been set for some time
systemd: Print a buildtime warning about the status with musl
linux-dtb.inc: Remove
systemd: Update to the latest 242 branch
Remove LSB support
Remove LSB support bits
libxcrypt: Fix the build with -Os
systemd: Update to the latest 242 branch
Remove leftovers from the eglinfo removal
Update to KERNEL_DEVICETREE variable.
ref-manual: Remove documentation for the removed bluez5 distro feature
ref-manual: Remove documentation for the removed gnome class
Alex Kiernan (1):
iputils: Set prefix correctly for usrmerge
Alexander Kanavin (23):
python3-numpy: update to 1.17.0
images: use 512M of RAM in qemu if 'opengl" is in DISTRO_FEATURES
boost: update to 1.71.0
beaglebone: use the default of 256M rather than 512M
rpm: resolve a host contamination issue for mono packaging
qemu: set default RAM to 256M for all machines
mesa: disable gallium swrast driver on x86 x32
ltp: move from python 2.x to python 3.x
lsb-release: fix upstream version check
libffi: fix upstream version check
qemu: switch to '-vga std' emulated hardware from vmware/cirrus for x86/mips
ca-certificates: use python 3 for builds
libpsl: use python 3 during builds
pseudo: use python 3 during builds
llvm: use python 3 during builds
virglrenderer: update 0.7.0 -> 0.8.0
webkitgtk: use Python 3 for builds
webkitgtk: update 2.24.3 -> 2.24.4
default-providers.inc: set mesa as the provider for native(sdk) virtual/libgl
libepoxy: enable x11 PACKAGECONFIG for native/nativesdk
eglinfo: remove the recipe
local.conf.sample: add a commented-out option to enable the gtk UI qemu frontend
package.bbclass: allow shell-style wildcards in PRIVATE_LIBS
Alistair Francis (2):
linux-yocto-dev: Mark qemuriscv64 as compatible
qemuriscv: Generate a wic rootFS with a larger filesystem
Andre McCurdy (11):
bitbake.conf: drop FETCHCMD, GITDIR, etc fetcher over-rides
tune-arm1136jf-s.inc: add hardfloat support
tune-arm1176jz-s.inc: add support for arm1176jz-s CPU specific tuning
tune-ep9312.inc: fix TUNEVALID description
packagegroup-core-boot: drop duplicate MACHINE_ESSENTIAL_EXTRA_RDEPENDS, etc
rootfs-postcommands.bbclass: add inittab tweak to read_only_rootfs_hook()
base-files: nsswitch.conf is glibc specific
sqlite3: make CFLAGS consistent across native, nativesdk and target cases
sqlite3: explicitly set target endian-ness
feature-arm-thumb.inc: fix ARM_THUMB_SUFFIX
dropbear: don't create invalid symlinks if ssh, scp, etc are disabled
Anuj Mittal (1):
libjpeg-turbo: upgrade 2.0.2 -> 2.0.3
Armin Kuster (4):
bitbake: tests/fetch: Resolve fetch error in bitbake-selftest
gcc-9.2: Security fix for CVE-2019-14250
gcc-8.3: Security fix for CVE-2019-14250
gcc-8.3: remove 8.3 from zeus
Bruce Ashfield (11):
bluez5: fix build against libc-headers 5.2+
kernel-devsrc: remove python2 dependency
perf: change dependencies on python to python3
perf: v5.3+ build fixes
devsrc: update arm64 scripts/prepare for kernels 5.3+
linux-libc-headers: update to v5.2 headers
linux-yocto: introduce 5.2 recipes
qemu: bump linux-yocto preferred version to 5.2
linux-yocto/5.2: update qemuriscv64 SRCREV
linux-yocto/5.2: config tweaks and kallsyms fix
linux-yocto: drop 5.0 recipes
Changhyeok Bae (1):
iputils: upgrade to s20190709
Changqing Li (8):
libedit: fix failed to get history
avahi-ui: support usrmerge
bootchart2: support usrmerge
systemd-bootchart: support usrmerge
bootchart2: switch to add patch from change source in do_install
mdadm: skip timeout testcase 11spare-migration
dnf.py: installroot support usrmerge
man-db: support usrmerge
Chen Qi (7):
bbtests.py: remove recipe-depends.dot
commands.py: fix typo
bitbake: cooker.py: remove generation of recipe-depends.dot
bind: fix build with python3 PACKAGECONFIG enabled
python-testtools: rdepend on doctest module
python-numpy: rdepend on multiprocessing module
python3: make misc package rdepend on pydoc and pickle modules
Christophe PRIOUZEAU (1):
common-licenses: update BSD-2-CLAUSE license text
Dan Callaghan (1):
autotools: always include config_site.d files in CONFIG_SITE
Daniel Klauer (1):
image.bbclass: Fix debug output for rootfs size
Denys Zagorui (1):
gzip: add nativesdk support
Drew Moseley (1):
runqemu: Fix typo in help text.
He Zhe (4):
ltp: cve/meltdown.c: Fix kernel symbol finding
ltp: syscalls: rt_sigwaitinfo01: Fix failure for MIPS arches
qemu: Add pkg-config handling for libgcrypt
qemu: Fix dependency of PACKAGECONFIG libcurl
Jacob Kroon (2):
btrfs-tools: Add PACKAGECONFIG knob for controlling python support
rm_work: Remove redundant 'after' in addtask statement
Jason Wessel (2):
serial-getty@.service: Allow device to fast fail if it does not exist
Revert "kernel.bbclass: adjust a condition checking"
Joshua Watt (9):
bitbake: bitbake: respect force flag in runall and runonly
oeqa: reproducible: Cleanup reproducible build
oeqa: reproducible: Use subTest for packages
oeqa: Set LD_LIBRARY_PATH when executing native commands
oeqa: reproducible: Record packages in test results
oeqa: Enable reproducible build test
oeqa: reproducible: Do two clean builds
oeqa: reproducible: Preserve sstate mirror for first build
resulttool: Add reproducible log extraction
Kai Kang (4):
avahi: launch avahi-daemon after connman
cups: redefine CUPS_SERVERBIN
texinfo: fix multilib file confliction
sysstat: 12.1.3 -> 12.1.6
Kevin Hao (1):
meta-yocto-bsp: Bump to the v5.2 kernel
Khem Raj (12):
go-1.12: update to 1.12.9 minor release
powerpc-tunes: Introduce bigendian tune
tune-riscv: Drop littleendian and introduce bigendian tune
gcc: Move STANDARD_STARTFILE_PREFIX_1 and STANDARD_STARTFILE_PREFIX_2 back to gcc.c
gcc: Fix ldbl-128 support for musl
libgpg-error: Fix build with gawk 5.x
libgpg-error: Fix build with gawk 5.x
musl: Update to latest master
gcc-9.2: Fix risc-v dynamic linker relocation
python3native, pythonnative: export PYTHON_LIBRARY and PYTHON_INCLUDE_DIR
oeqa: Recognise svlogd as another logger
python3-manifest.json: Fix typo in summary
Mark Asselstine (1):
sdkext: use simpler kernel module for devtool test
Mark Hatle (1):
yocto-check-layer: Allow any case for README file detection
Martin Hundebøll (1):
initscripts: remove warnings on read-only-rootfs (again)
Martin Jansa (3):
bitbake: utils: Fix movefile() exception handling with python3
bitbake: fetch2: show warning when renaming the archive with bad checksum failed
bitbake: bitbake-user-manual: Improve the example for Removal (Override Style Syntax)
Mazliana (1):
oeqa/kerneldevelopment: Able to apply a single patch to the Linux kernel source
Ming Liu (1):
weston: uprev to 7.0.0
Nathan Rossi (30):
binutils: Fix mips patch which changes default emulation
oeqa/utils/nfs: Add unfs_server function to setup a userspace NFS server
scripts/lib/resulttool/report.py: Add more result types
gcc-common.inc: Process staging fixme with correct target/native sysroot
oeqa/core/tests: Skip test_fail_duplicated_module
oeqa/core/tests: Fix test_data module tests
Clean up remnants of glibc-initial
oe-selftest: Implement console 'keepalive' output
dejagnu: Add dejagnu for binutils/gcc test suites
binutils-cross-testsuite: Create recipe for test suite execution
gcc-runtime: Add do_check task for executing gcc test suites
glibc-testsuite: Create a recipe to implement glibc test suite
gcc-testsuite.inc: Fix ssh.exp, ensure multilib_flags are populated
security_flags.inc: Add overrides for glibc-testsuite to match glibc
archiver.bbclass: Do not archive srpm's if there are no package tasks
oeqa/core: Implement proper extra result collection and serialization
oeqa/core: Rework OETestTag and remove unused OETestFilter
oeqa/selftest: Add test run filtering based on test tags
oeqa/core/runner.py: Fix OETestTag listing
oeqa/selftest/binutils: Create selftest case for binutils test suite
oeqa/selftest/gcc: Create selftest case for gcc test suite
oeqa/selftest/glibc: Create selftest case for glibc test suite
oeqa/selftest/cases/glibc.py: Don't install python3 and pexpect
oeqa/selftest: For toolchain tests do not fail if a test failed
oeqa/selftest: Toolchain tests suffix "-user" for qemu usermode results
oeqa/selftest: Use extraresults on self instead of self.tc
oeqa/selftest/context.py: Change -t/-T args to be optional
oeqa/core/decorator: Fix super class modifying subclass tags
oeqa/selftest/cases/gcc.py: Split into classes for parallelism
oeqa/selftest/cases/glibc.py: Rework and tag with toolchain-user/system
Neil Armstrong (1):
mesa: Add support for the panfrost PACKAGECONFIG
Oleksandr Kravchuk (8):
libsolv: update to 0.7.6
libevdev: update to 1.8.0
ell: update to 0.22
go-dep: update to 0.5.4
libsecret: 0.19.0
python3-pbr: update to 5.4.3
python3-git: update to 3.0.2
libxcrypt: update to 4.4.8
Peiran Hong (1):
diffutils: Added perl to support ptest & Skipped one test case
Peter Kjellerstedt (2):
libffi: Make it build for MIPS o32
devtool: Avoid failure for recipes with S == WORKDIR and no local files
Richard Purdie (11):
poky-altcfg: Replace poky-lsb with poky-altcfg
ca-certificates: Fix reproducibilty and multilib issue
gcc-cross: Clean up fixed-includes
systemtap: Use latest and greatest git version for 5.2 kernel support
gcc-cross: Fix header file corruption problems
poky: Use 5.2 kernel by default
binutils/glibc-testsuite: inherit nopackages to fix world builds
systemtap: Drop patches merged upstream
poky-tiny/poky-altcfg: Use busybox-mdev and systemd
oeqa/selftest: Markup 'machine' specific test cases
oeqa/selftest: Tweak binutils tests tags as toolchain/user and system
Robert Yang (3):
ccache: 3.7.1 -> 3.7.3
nfs-utils: 2.3.3 -> 2.4.1
build-compare: 2015.02.10 -> 2019.08.14
Ross Burton (11):
libedit: remove FETCHCMD append
libnl: upgrade to 3.5.0
libnl: don't patch libnl-3.0.pc
systemd: explicitly set the path to nologin
core-image-sato: don't use 512MB in qemumips
patch: add CVE tags to patches
pango: 1.44.6 upgrade
pango: add PACKAGECONFIG for libthai support
harfbuzz: upgrade to 2.6.1
systemd: ensure reproducible builds by clearly exposing the time epoch support
ref-system-requirements: add Debian 10 to supported distribution list
Scott Rifenbark (5):
ref-manual: Updated the "AS" variable
ref-manual: Updates to "Building Your Recipe"
dev-manual: Updated "Creating a Team Development Environment"
poky-end: Added "pylint3" package to Ubuntu essentials.
ref-manual: sync list of image types with source
Tim Blechmann (1):
icecc: blacklist systemtap
Trevor Gamblin (2):
lighttpd: drop hard-coded lua version in PACKAGECONFIG
libevent: add granularity to ptest log
Vijai Kumar K (1):
lib/oe/gpg_sign.py: Remove unwanted import
Wes Lindauer (1):
bitbake: bitbake: cooker: Ensure bbappends are found in stable order
Yi Zhao (1):
libbsd: upgrade 0.9.1 -> 0.10.0
Yuan Chao (1):
man-db: upgrade 2.8.6.1 -> 2.8.7
Zang Ruochen (7):
libarchive:upgrade 3.3.3 -> 3.4.0
python3-pip:upgrade 19.2.2 -> 19.2.3
logrotate:upgrade 3.15.0 -> 3.15.1
libogg:upgrade 1.3.3 -> 1.3.4
dtc:upgrade 1.5.0 -> 1.5.1
python3-dbus:upgrade 1.2.8 -> 1.2.10
meson:upgrade 0.51.1 -> 0.51.2
Change-Id: I341e8df65e8196114088a2d6d6eb3a33296188b4
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky')
389 files changed, 3236 insertions, 11685 deletions
diff --git a/poky/README.LSB b/poky/README.LSB deleted file mode 100644 index fecbe548b..000000000 --- a/poky/README.LSB +++ /dev/null @@ -1,29 +0,0 @@ -OE-Core aims to be able to provide basic LSB compatible images. There -are some challenges for OE as LSB isn't always 100% relevant to its -target embedded and IoT audiences. - -One challenge is that the LSB spec is no longer being actively -developed [https://github.com/LinuxStandardBase/lsb] and has -components which are end of life or significantly dated. OE -therefore provides compatibility with the following caveats: - -* Qt4 is provided by the separate meta-qt4 layer. Its noted that Qt4 - is end of life and this isn't something the core project regularly - tests any longer. Users are recommended to group together to support - maintenance of that layer. [http://git.yoctoproject.org/cgit/cgit.cgi/meta-qt4/] - -* GTK+ 2 is provided by meta-oe. It is noted that GTK+ 2 is end of life - and use of GTK+ 2 isn't recommended. - -* mailx has been dropped since its no longer being developed upstream - and there are better, more modern replacements such as s-nail - (http://sdaoden.eu/code.html) or mailutils (http://mailutils.org/). - -* A few perl modules that were required by LSB 4.x aren't provided: - libclass-isa, libenv, libdumpvalue, libfile-checktree, - libi18n-collate, libpod-plainer. - -* libpng 1.2 isn't provided; oe-core includes the latest release of libpng - instead. - -* pax (POSIX standard archive) tool is not provided. diff --git a/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml index a125ad332..88622421d 100644 --- a/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml +++ b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml @@ -420,13 +420,17 @@ FOO = "123 456 789 123456 123 456 123 456" FOO_remove = "123" FOO_remove = "456" - FOO2 = "abc def ghi abcdef abc def abc def" - FOO2_remove = "abc def" + FOO2 = " abc def ghi abcdef abc def abc def def" + FOO2_remove = " \ + def \ + abc \ + ghi \ + " </literallayout> The variable <filename>FOO</filename> becomes - " 789 123456 " + " 789 123456 " and <filename>FOO2</filename> becomes - " ghi abcdef ". + " jkl abcdef ". </para> <para> diff --git a/poky/bitbake/lib/bb/cooker.py b/poky/bitbake/lib/bb/cooker.py index 0607fcc70..5840aa75e 100644 --- a/poky/bitbake/lib/bb/cooker.py +++ b/poky/bitbake/lib/bb/cooker.py @@ -919,6 +919,10 @@ class BBCooker: os.unlink('package-depends.dot') except FileNotFoundError: pass + try: + os.unlink('recipe-depends.dot') + except FileNotFoundError: + pass with open('task-depends.dot', 'w') as f: f.write("digraph depends {\n") @@ -932,27 +936,6 @@ class BBCooker: f.write("}\n") logger.info("Task dependencies saved to 'task-depends.dot'") - with open('recipe-depends.dot', 'w') as f: - f.write("digraph depends {\n") - pndeps = {} - for task in sorted(depgraph["tdepends"]): - (pn, taskname) = task.rsplit(".", 1) - if pn not in pndeps: - pndeps[pn] = set() - for dep in sorted(depgraph["tdepends"][task]): - (deppn, deptaskname) = dep.rsplit(".", 1) - pndeps[pn].add(deppn) - for pn in sorted(pndeps): - fn = depgraph["pn"][pn]["filename"] - version = depgraph["pn"][pn]["version"] - f.write('"%s" [label="%s\\n%s\\n%s"]\n' % (pn, pn, version, fn)) - for dep in sorted(pndeps[pn]): - if dep == pn: - continue - f.write('"%s" -> "%s"\n' % (pn, dep)) - f.write("}\n") - logger.info("Flattened recipe dependencies saved to 'recipe-depends.dot'") - def show_appends_with_no_recipes(self): # Determine which bbappends haven't been applied @@ -1869,6 +1852,7 @@ class CookerCollectFiles(object): (bbappend, filename) = b if (bbappend == f) or ('%' in bbappend and bbappend.startswith(f[:bbappend.index('%')])): filelist.append(filename) + filelist.sort() return filelist def collection_priorities(self, pkgfns, d): diff --git a/poky/bitbake/lib/bb/fetch2/__init__.py b/poky/bitbake/lib/bb/fetch2/__init__.py index f6b5529bb..1f5f8f1f1 100644 --- a/poky/bitbake/lib/bb/fetch2/__init__.py +++ b/poky/bitbake/lib/bb/fetch2/__init__.py @@ -962,7 +962,8 @@ def rename_bad_checksum(ud, suffix): new_localpath = "%s_bad-checksum_%s" % (ud.localpath, suffix) bb.warn("Renaming %s to %s" % (ud.localpath, new_localpath)) - bb.utils.movefile(ud.localpath, new_localpath) + if not bb.utils.movefile(ud.localpath, new_localpath): + bb.warn("Renaming %s to %s failed, grep movefile in log.do_fetch to see why" % (ud.localpath, new_localpath)) def try_mirror_url(fetch, origud, ud, ld, check = False): diff --git a/poky/bitbake/lib/bb/runqueue.py b/poky/bitbake/lib/bb/runqueue.py index 4f69578e4..addb2bb82 100644 --- a/poky/bitbake/lib/bb/runqueue.py +++ b/poky/bitbake/lib/bb/runqueue.py @@ -849,6 +849,20 @@ class RunQueueData: for depend in depends: mark_active(depend, depth+1) + def invalidate_task(tid, error_nostamp): + (mc, fn, taskname, taskfn) = split_tid_mcfn(tid) + taskdep = self.dataCaches[mc].task_deps[taskfn] + if fn + ":" + taskname not in taskData[mc].taskentries: + logger.warning("Task %s does not exist, invalidating this task will have no effect" % taskname) + if 'nostamp' in taskdep and taskname in taskdep['nostamp']: + if error_nostamp: + bb.fatal("Task %s is marked nostamp, cannot invalidate this task" % taskname) + else: + bb.debug(1, "Task %s is marked nostamp, cannot invalidate this task" % taskname) + else: + logger.verbose("Invalidate task %s, %s", taskname, fn) + bb.parse.siggen.invalidate_task(taskname, self.dataCaches[mc], taskfn) + self.target_tids = [] for (mc, target, task, fn) in self.targets: @@ -917,6 +931,8 @@ class RunQueueData: for tid in list(runall_tids): mark_active(tid,1) + if self.cooker.configuration.force: + invalidate_task(tid, False) for tid in list(self.runtaskentries.keys()): if tid not in runq_build: @@ -938,6 +954,8 @@ class RunQueueData: for tid in list(runonly_tids): mark_active(tid,1) + if self.cooker.configuration.force: + invalidate_task(tid, False) for tid in list(self.runtaskentries.keys()): if tid not in runq_build: @@ -1114,20 +1132,6 @@ class RunQueueData: continue self.runq_setscene_tids.append(tid) - def invalidate_task(tid, error_nostamp): - (mc, fn, taskname, taskfn) = split_tid_mcfn(tid) - taskdep = self.dataCaches[mc].task_deps[taskfn] - if fn + ":" + taskname not in taskData[mc].taskentries: - logger.warning("Task %s does not exist, invalidating this task will have no effect" % taskname) - if 'nostamp' in taskdep and taskname in taskdep['nostamp']: - if error_nostamp: - bb.fatal("Task %s is marked nostamp, cannot invalidate this task" % taskname) - else: - bb.debug(1, "Task %s is marked nostamp, cannot invalidate this task" % taskname) - else: - logger.verbose("Invalidate task %s, %s", taskname, fn) - bb.parse.siggen.invalidate_task(taskname, self.dataCaches[mc], taskfn) - self.init_progress_reporter.next_stage() # Invalidate task if force mode active diff --git a/poky/bitbake/lib/bb/tests/fetch.py b/poky/bitbake/lib/bb/tests/fetch.py index 23c6338a4..2ee030546 100644 --- a/poky/bitbake/lib/bb/tests/fetch.py +++ b/poky/bitbake/lib/bb/tests/fetch.py @@ -1200,8 +1200,8 @@ class FetchLatestVersionTest(FetcherTest): # packages with valid UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX ("cups", "http://www.cups.org/software/1.7.2/cups-1.7.2-source.tar.bz2", "https://github.com/apple/cups/releases", "(?P<name>cups\-)(?P<pver>((\d+[\.\-_]*)+))\-source\.tar\.gz") : "2.0.0", - ("db", "http://download.oracle.com/berkeley-db/db-5.3.21.tar.gz", "http://www.oracle.com/technetwork/products/berkeleydb/downloads/index-082944.html", "http://download.oracle.com/otn/berkeley-db/(?P<name>db-)(?P<pver>((\d+[\.\-_]*)+))\.tar\.gz") - : "6.1.19", + ("db", "http://download.oracle.com/berkeley-db/db-5.3.21.tar.gz", "http://ftp.debian.org/debian/pool/main/d/db5.3/", "(?P<name>db5\.3_)(?P<pver>\d+(\.\d+)+).+\.orig\.tar\.xz") + : "5.3.10", } @skipIfNoNetwork() diff --git a/poky/bitbake/lib/bb/utils.py b/poky/bitbake/lib/bb/utils.py index 0618e46fe..3e90b6a30 100644 --- a/poky/bitbake/lib/bb/utils.py +++ b/poky/bitbake/lib/bb/utils.py @@ -780,7 +780,7 @@ def movefile(src, dest, newmtime = None, sstat = None): os.rename(src, destpath) renamefailed = 0 except Exception as e: - if e[0] != errno.EXDEV: + if e.errno != errno.EXDEV: # Some random error. print("movefile: Failed to move", src, "to", dest, e) return None diff --git a/poky/documentation/dev-manual/dev-manual-start.xml b/poky/documentation/dev-manual/dev-manual-start.xml index 5625dfcdd..59ffa49bb 100644 --- a/poky/documentation/dev-manual/dev-manual-start.xml +++ b/poky/documentation/dev-manual/dev-manual-start.xml @@ -23,9 +23,8 @@ It might not be immediately clear how you can use the Yocto Project in a team development environment, or how to scale it for a large team of developers. - One of the strengths of the Yocto Project is that it is extremely - flexible. - Thus, you can adapt it to many different use cases and scenarios. + You can adapt the Yocto Project to many different use cases and + scenarios. However, this flexibility could cause difficulties if you are trying to create a working setup that scales across a large team. </para> diff --git a/poky/documentation/poky.ent b/poky/documentation/poky.ent index b5f600969..192b9418f 100644 --- a/poky/documentation/poky.ent +++ b/poky/documentation/poky.ent @@ -60,7 +60,7 @@ <!ENTITY UBUNTU_HOST_PACKAGES_ESSENTIAL "gawk wget git-core diffstat unzip texinfo gcc-multilib \ build-essential chrpath socat cpio python python3 python3-pip python3-pexpect \ xz-utils debianutils iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev \ - xterm"> + pylint3 xterm"> <!ENTITY FEDORA_HOST_PACKAGES_ESSENTIAL "gawk make wget tar bzip2 gzip python3 unzip perl patch \ diffutils diffstat git cpp gcc gcc-c++ glibc-devel texinfo chrpath \ ccache perl-Data-Dumper perl-Text-ParseWords perl-Thread-Queue perl-bignum socat \ diff --git a/poky/documentation/ref-manual/ref-classes.xml b/poky/documentation/ref-manual/ref-classes.xml index ece47e757..5403f20b6 100644 --- a/poky/documentation/ref-manual/ref-classes.xml +++ b/poky/documentation/ref-manual/ref-classes.xml @@ -318,23 +318,6 @@ </para> </section> -<section id='ref-classes-bluetooth'> - <title><filename>bluetooth.bbclass</filename></title> - - <para> - The <filename>bluetooth</filename> class defines a variable that - expands to the recipe (package) providing core - bluetooth support on the platform. - </para> - - <para> - For details on how the class works, see the - <filename>meta/classes/bluetooth.bbclass</filename> file in the Yocto - Project - <link linkend='source-directory'>Source Directory</link>. - </para> -</section> - <section id='ref-classes-buildhistory'> <title><filename>buildhistory.bbclass</filename></title> @@ -937,21 +920,6 @@ </para> </section> -<section id='ref-classes-gnome'> - <title><filename>gnome.bbclass</filename></title> - - <para> - The <filename>gnome</filename> class supports recipes that - build software from the GNOME stack. - This class inherits the - <link linkend='ref-classes-gnomebase'><filename>gnomebase</filename></link>, - <link linkend='ref-classes-gtk-icon-cache'><filename>gtk-icon-cache</filename></link>, - <link linkend='ref-classes-gconf'><filename>gconf</filename></link> and - <link linkend='ref-classes-mime'><filename>mime</filename></link> classes. - The class also disables GObject introspection where applicable. - </para> -</section> - <section id='ref-classes-gnomebase'> <title><filename>gnomebase.bbclass</filename></title> diff --git a/poky/documentation/ref-manual/ref-devtool-reference.xml b/poky/documentation/ref-manual/ref-devtool-reference.xml index 4810d28ad..11f7399c5 100644 --- a/poky/documentation/ref-manual/ref-devtool-reference.xml +++ b/poky/documentation/ref-manual/ref-devtool-reference.xml @@ -629,18 +629,18 @@ <title>Building Your Recipe</title> <para> - Use the <filename>devtool build</filename> command to cause the - OpenEmbedded build system to build your recipe. + Use the <filename>devtool build</filename> command to build your + recipe. The <filename>devtool build</filename> command is equivalent to - <filename>bitbake -c populate_sysroot</filename>. + the <filename>bitbake -c populate_sysroot</filename> command. </para> <para> When you use the <filename>devtool build</filename> command, - you must supply the root name of the recipe (i.e. no version, - paths, or extensions). + you must supply the root name of the recipe (i.e. do not provide + versions, paths, or extensions). You can use either the "-s" or the "--disable-parallel-make" - option to disable parallel makes during the build. + options to disable parallel makes during the build. Here is an example: <literallayout class='monospaced'> $ devtool build <replaceable>recipe</replaceable> diff --git a/poky/documentation/ref-manual/ref-features.xml b/poky/documentation/ref-manual/ref-features.xml index b057d2d04..44ba67cf5 100644 --- a/poky/documentation/ref-manual/ref-features.xml +++ b/poky/documentation/ref-manual/ref-features.xml @@ -154,27 +154,6 @@ </para></listitem> <listitem><para><emphasis>bluetooth:</emphasis> Include bluetooth support (integrated BT only).</para></listitem> - <listitem><para><emphasis>bluez5:</emphasis> Include - BlueZ Version 5, which provides core Bluetooth layers and - protocols support. - <note> - The default value for the - <filename>DISTRO FEATURES</filename> variable includes - "bluetooth", which causes bluez5 to be backfilled in - for bluetooth support. - If you do not want bluez5 backfilled and would rather - use bluez4, you need to use the - <link linkend='var-DISTRO_FEATURES_BACKFILL_CONSIDERED'><filename>DISTRO_FEATURES_BACKFILL_CONSIDERED</filename></link> - variable as follows: - <literallayout class='monospaced'> - DISTRO_FEATURES_BACKFILL_CONSIDERED = "bluez5" - </literallayout> - Setting this variable tells the OpenEmbedded build - system that you have considered but ruled - out using the bluez5 feature and that bluez4 will be - used. - </note> - </para></listitem> <listitem><para><emphasis>cramfs:</emphasis> Include CramFS support.</para></listitem> <listitem><para><emphasis>directfb:</emphasis> diff --git a/poky/documentation/ref-manual/ref-system-requirements.xml b/poky/documentation/ref-manual/ref-system-requirements.xml index 239dd84bb..51995309d 100644 --- a/poky/documentation/ref-manual/ref-system-requirements.xml +++ b/poky/documentation/ref-manual/ref-system-requirements.xml @@ -95,6 +95,7 @@ <listitem><para>CentOS 7.x</para></listitem> <listitem><para>Debian GNU/Linux 8.x (Jessie)</para></listitem> <listitem><para>Debian GNU/Linux 9.x (Stretch)</para></listitem> + <listitem><para>Debian GNU/Linux 10.x (Buster)</para></listitem> <listitem><para>OpenSUSE 42.3</para></listitem> </itemizedlist> </para> diff --git a/poky/documentation/ref-manual/ref-variables.xml b/poky/documentation/ref-manual/ref-variables.xml index 0080364e4..93b758838 100644 --- a/poky/documentation/ref-manual/ref-variables.xml +++ b/poky/documentation/ref-manual/ref-variables.xml @@ -335,7 +335,7 @@ <glossdef> <para role="glossdeffirst"> <!-- <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> --> - The minimal command and arguments used to run the + Minimal command and arguments needed to run the assembler. </para> </glossdef> @@ -6606,6 +6606,7 @@ by default: <literallayout class='monospaced'> btrfs + container cpio cpio.gz cpio.lz4 @@ -6621,13 +6622,14 @@ ext3.gz ext4 ext4.gz - hdddirect + f2fs hddimg iso jffs2 jffs2.sum multiubi squashfs + squashfs-lz4 squashfs-lzo squashfs-xz tar @@ -7580,15 +7582,9 @@ However, providing just the <filename>.dtb</filename> file is preferred. </note> - In order to use this variable, you must have the include - files in your kernel recipe: - <literallayout class='monospaced'> - require recipes-kernel/linux/linux-dtb.inc - </literallayout> - or - <literallayout class='monospaced'> - require recipes-kernel/linux/linux-yocto.inc - </literallayout> + In order to use this variable, the + <link linkend='ref-classes-kernel-devicetree'><filename>kernel-devicetree</filename></link> + class must be inherited. </para> </glossdef> </glossentry> diff --git a/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc b/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc index 081584f39..9926c1bb0 100644 --- a/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc +++ b/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc @@ -1,2 +1,8 @@ +# Add an extra DISTRO_FEATURE DISTRO_FEATURES_append = " pam" -PREFERRED_VERSION_linux-yocto_linuxstdbase ?= "4.19%" + +# Use the LTSI Kernel +PREFERRED_VERSION_linux-yocto ?= "4.19%" + +# Ensure the kernel nfs server is enabled +KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc" diff --git a/poky/meta-poky/conf/distro/poky-altcfg.conf b/poky/meta-poky/conf/distro/poky-altcfg.conf new file mode 100644 index 000000000..177bf8d18 --- /dev/null +++ b/poky/meta-poky/conf/distro/poky-altcfg.conf @@ -0,0 +1,15 @@ +# +# An example of subclassing a distro, primarily used for testing alternate configuration +# combinations on the Yocto Project autobuilder +# +require conf/distro/poky.conf + +DISTRO = "poky-altcfg" +DISTROOVERRIDES = "poky:poky-altcfg" +#DISTROOVERRIDES = "poky:linuxstdbase" + +INIT_MANAGER ?= "systemd" +# systemd isn't suitable with musl +INIT_MANAGER_libc-musl ?= "sysvinit" + +require conf/distro/include/poky-distro-alt-test-config.inc diff --git a/poky/meta-poky/conf/distro/poky-lsb.conf b/poky/meta-poky/conf/distro/poky-lsb.conf deleted file mode 100644 index 9b36c87c4..000000000 --- a/poky/meta-poky/conf/distro/poky-lsb.conf +++ /dev/null @@ -1,13 +0,0 @@ - -require conf/distro/poky.conf - -DISTRO = "poky-lsb" -DISTROOVERRIDES = "poky:linuxstdbase" - -DISTRO_FEATURES_append = " pam" - -# Ensure the kernel nfs server is enabled -KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc" - -# Use the LTSI Kernel for LSB Testing -PREFERRED_VERSION_linux-yocto_linuxstdbase ?= "4.19%" diff --git a/poky/meta-poky/conf/distro/poky-tiny.conf b/poky/meta-poky/conf/distro/poky-tiny.conf index 1f8b6e8ff..c6d4b88f8 100644 --- a/poky/meta-poky/conf/distro/poky-tiny.conf +++ b/poky/meta-poky/conf/distro/poky-tiny.conf @@ -82,12 +82,7 @@ DISTRO_FEATURES_class-native = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO DISTRO_FEATURES_class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" # enable mdev/busybox for init -VIRTUAL-RUNTIME_dev_manager = "busybox-mdev" -VIRTUAL-RUNTIME_login_manager = "busybox" -VIRTUAL-RUNTIME_init_manager = "busybox" -VIRTUAL-RUNTIME_initscripts = "initscripts" -VIRTUAL-RUNTIME_keymaps = "keymaps" -DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit" +INIT_MANAGER ?= "mdev-busybox" # FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in # packagegroup-core-base to select modutils-initscripts or not. Similar with "net" and @@ -117,9 +112,6 @@ PNBLACKLIST[build-appliance-image] = "not buildable with poky-tiny" PNBLACKLIST[core-image-base] = "not buildable with poky-tiny" PNBLACKLIST[core-image-clutter] = "not buildable with poky-tiny" PNBLACKLIST[core-image-full-cmdline] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-lsb] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-lsb-dev] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-lsb-sdk] = "not buildable with poky-tiny" PNBLACKLIST[core-image-rt] = "not buildable with poky-tiny" PNBLACKLIST[core-image-rt-sdk] = "not buildable with poky-tiny" PNBLACKLIST[core-image-sato] = "not buildable with poky-tiny" diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index aa041e2dc..f999992c9 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -21,7 +21,7 @@ POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" -PREFERRED_VERSION_linux-yocto ?= "5.0%" +PREFERRED_VERSION_linux-yocto ?= "5.2%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" diff --git a/poky/meta-poky/conf/local.conf.sample b/poky/meta-poky/conf/local.conf.sample index b36530dd8..c86eee456 100644 --- a/poky/meta-poky/conf/local.conf.sample +++ b/poky/meta-poky/conf/local.conf.sample @@ -238,12 +238,16 @@ BB_DISKMON_DIRS ??= "\ # Qemu configuration # # By default native qemu will build with a builtin VNC server where graphical output can be -# seen. The line below enable the SDL backend too. By default libsdl2-native will -# be built, if you want to use your host's libSDL instead of the minimal libsdl built -# by libsdl2-native then uncomment the ASSUME_PROVIDED line below. +# seen. The line below enables the SDL UI frontend too. PACKAGECONFIG_append_pn-qemu-system-native = " sdl" +# By default libsdl2-native will be built, if you want to use your host's libSDL instead of +# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. #ASSUME_PROVIDED += "libsdl2-native" +# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds +# a handy set of menus for controlling the emulator. +#PACKAGECONFIG_append_pn-qemu-system-native = " gtk+" + # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. diff --git a/poky/meta-poky/conf/local.conf.sample.extended b/poky/meta-poky/conf/local.conf.sample.extended index 77e8be26f..dc92a16f6 100644 --- a/poky/meta-poky/conf/local.conf.sample.extended +++ b/poky/meta-poky/conf/local.conf.sample.extended @@ -270,7 +270,7 @@ DISTRO_FEATURES_remove = "x11" # # By including the security_flags include file you enable flags # to the compiler and linker that cause them to generate more secure -# code, this is enabled by default in the poky-lsb distro. +# code. # This does affect compile speed slightly. # # Use the following line to enable the security compiler and linker flags to your build diff --git a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index 7c7b3059a..08dd3a507 100644 --- a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -24,7 +24,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "5.0%" +PREFERRED_VERSION_linux-yocto ?= "5.2%" KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" @@ -47,7 +47,6 @@ QB_DEFAULT_FSTYPE = "wic" QB_FSINFO = "wic:no-kernel-in-fs" QB_KERNEL_ROOT = "/dev/vda2" QB_SYSTEM_NAME = "qemu-system-arm" -QB_MEM = "-m 512" QB_MACHINE = "-machine virt" QB_CPU = "-cpu cortex-a15" QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0 systemd.mask=systemd-networkd" diff --git a/poky/meta-yocto-bsp/conf/machine/edgerouter.conf b/poky/meta-yocto-bsp/conf/machine/edgerouter.conf index 88592dbc8..6331368f8 100644 --- a/poky/meta-yocto-bsp/conf/machine/edgerouter.conf +++ b/poky/meta-yocto-bsp/conf/machine/edgerouter.conf @@ -11,7 +11,7 @@ KERNEL_ALT_IMAGETYPE = "vmlinux.bin" KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "5.0%" +PREFERRED_VERSION_linux-yocto ?= "5.2%" SERIAL_CONSOLES = "115200;ttyS0" USE_VT ?= "0" diff --git a/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf index e2dce5673..538279628 100644 --- a/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf +++ b/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf @@ -15,7 +15,7 @@ SERIAL_CONSOLES = "115200;ttyS0" MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" -PREFERRED_VERSION_linux-yocto ?= "5.0%" +PREFERRED_VERSION_linux-yocto ?= "5.2%" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.0.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.0.bbappend deleted file mode 100644 index d7cf1216f..000000000 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.0.bbappend +++ /dev/null @@ -1,27 +0,0 @@ -KBRANCH_genericx86 = "v5.0/standard/base" -KBRANCH_genericx86-64 = "v5.0/standard/base" -KBRANCH_edgerouter = "v5.0/standard/edgerouter" -KBRANCH_beaglebone-yocto = "v5.0/standard/beaglebone" -KBRANCH_mpc8315e-rdb = "v5.0/standard/fsl-mpc8315e-rdb" - -KMACHINE_genericx86 ?= "common-pc" -KMACHINE_genericx86-64 ?= "common-pc-64" -KMACHINE_beaglebone-yocto ?= "beaglebone" - -SRCREV_machine_genericx86 ?= "f990fd0ce123aa6035042efad09b2ddc3e7d48f4" -SRCREV_machine_genericx86-64 ?= "f990fd0ce123aa6035042efad09b2ddc3e7d48f4" -SRCREV_machine_edgerouter ?= "f990fd0ce123aa6035042efad09b2ddc3e7d48f4" -SRCREV_machine_beaglebone-yocto ?= "f990fd0ce123aa6035042efad09b2ddc3e7d48f4" -SRCREV_machine_mpc8315e-rdb ?= "670ce7e9db627d0c2067cfdb571ddc1f117818d8" - -COMPATIBLE_MACHINE_genericx86 = "genericx86" -COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" -COMPATIBLE_MACHINE_edgerouter = "edgerouter" -COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" -COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" - -LINUX_VERSION_genericx86 = "5.0.13" -LINUX_VERSION_genericx86-64 = "5.0.13" -LINUX_VERSION_edgerouter = "5.0.13" -LINUX_VERSION_beaglebone-yocto = "5.0.13" -LINUX_VERSION_mpc8315e-rdb = "5.0.13" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.2.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.2.bbappend new file mode 100644 index 000000000..b7cefd25c --- /dev/null +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.2.bbappend @@ -0,0 +1,27 @@ +KBRANCH_genericx86 = "v5.2/standard/base" +KBRANCH_genericx86-64 = "v5.2/standard/base" +KBRANCH_edgerouter = "v5.2/standard/edgerouter" +KBRANCH_beaglebone-yocto = "v5.2/standard/beaglebone" +KBRANCH_mpc8315e-rdb = "v5.2/standard/fsl-mpc8315e-rdb" + +KMACHINE_genericx86 ?= "common-pc" +KMACHINE_genericx86-64 ?= "common-pc-64" +KMACHINE_beaglebone-yocto ?= "beaglebone" + +SRCREV_machine_genericx86 ?= "77c28ea0e55cabb0b22b47d4eb2cc94b0940dfe6" +SRCREV_machine_genericx86-64 ?= "35276d20c01a78ee3640a074446b0c15c486c5d0" +SRCREV_machine_edgerouter ?= "35276d20c01a78ee3640a074446b0c15c486c5d0" +SRCREV_machine_beaglebone-yocto ?= "77c28ea0e55cabb0b22b47d4eb2cc94b0940dfe6" +SRCREV_machine_mpc8315e-rdb ?= "cae01d71ef67eaafec75ce24f49b038b705b8711" + +COMPATIBLE_MACHINE_genericx86 = "genericx86" +COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE_edgerouter = "edgerouter" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" +COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" + +LINUX_VERSION_genericx86 = "5.2.10" +LINUX_VERSION_genericx86-64 = "5.2.10" +LINUX_VERSION_edgerouter = "5.2.10" +LINUX_VERSION_beaglebone-yocto = "5.2.10" +LINUX_VERSION_mpc8315e-rdb = "5.2.10" diff --git a/poky/meta/classes/archiver.bbclass b/poky/meta/classes/archiver.bbclass index af9f010df..13b05bb5f 100644 --- a/poky/meta/classes/archiver.bbclass +++ b/poky/meta/classes/archiver.bbclass @@ -78,6 +78,9 @@ python () { bb.debug(1, 'archiver: %s is excluded, covered by gcc-source' % pn) return + def hasTask(task): + return bool(d.getVarFlag(task, "task", False)) and not bool(d.getVarFlag(task, "noexec", False)) + ar_src = d.getVarFlag('ARCHIVER_MODE', 'src') ar_dumpdata = d.getVarFlag('ARCHIVER_MODE', 'dumpdata') ar_recipe = d.getVarFlag('ARCHIVER_MODE', 'recipe') @@ -98,9 +101,6 @@ python () { # There is a corner case with "gcc-source-${PV}" recipes, they don't have # the "do_configure" task, so we need to use "do_preconfigure" - def hasTask(task): - return bool(d.getVarFlag(task, "task", False)) and not bool(d.getVarFlag(task, "noexec", False)) - if hasTask("do_preconfigure"): d.appendVarFlag('do_ar_configured', 'depends', ' %s:do_preconfigure' % pn) elif hasTask("do_configure"): @@ -118,7 +118,11 @@ python () { # Output the SRPM package if d.getVarFlag('ARCHIVER_MODE', 'srpm') == "1" and d.getVar('PACKAGES'): - if "package_rpm" in d.getVar('PACKAGE_CLASSES'): + if "package_rpm" not in d.getVar('PACKAGE_CLASSES'): + bb.fatal("ARCHIVER_MODE[srpm] needs package_rpm in PACKAGE_CLASSES") + + # Some recipes do not have any packaging tasks + if hasTask("do_package_write_rpm"): d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_package_write_rpm' % pn) d.appendVarFlag('do_package_write_rpm', 'dirs', ' ${ARCHIVER_RPMTOPDIR}') d.appendVarFlag('do_package_write_rpm', 'sstate-inputdirs', ' ${ARCHIVER_RPMTOPDIR}') @@ -133,8 +137,6 @@ python () { d.appendVarFlag('do_package_write_rpm', 'depends', ' %s:do_ar_patched' % pn) elif ar_src == "configured": d.appendVarFlag('do_package_write_rpm', 'depends', ' %s:do_ar_configured' % pn) - else: - bb.fatal("ARCHIVER_MODE[srpm] needs package_rpm in PACKAGE_CLASSES") } # Take all the sources for a recipe and puts them in WORKDIR/archiver-work/. diff --git a/poky/meta/classes/autotools.bbclass b/poky/meta/classes/autotools.bbclass index 8768a6ad6..3d22ad025 100644 --- a/poky/meta/classes/autotools.bbclass +++ b/poky/meta/classes/autotools.bbclass @@ -25,7 +25,9 @@ inherit siteinfo # Space separated list of shell scripts with variables defined to supply test # results for autoconf tests we cannot run at build time. -export CONFIG_SITE = "${@siteinfo_get_files(d)}" +# The value of this variable is filled in in a prefunc because it depends on +# the contents of the sysroot. +export CONFIG_SITE acpaths ?= "default" EXTRA_AUTORECONF = "--exclude=autopoint" @@ -132,6 +134,8 @@ EXTRACONFFUNCS ??= "" EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}" do_configure[prefuncs] += "autotools_preconfigure autotools_aclocals ${EXTRACONFFUNCS}" +do_compile[prefuncs] += "autotools_aclocals" +do_install[prefuncs] += "autotools_aclocals" do_configure[postfuncs] += "autotools_postconfigure" ACLOCALDIR = "${STAGING_DATADIR}/aclocal" @@ -140,7 +144,6 @@ ACLOCALEXTRAPATH_class-target = " -I ${STAGING_DATADIR_NATIVE}/aclocal/" ACLOCALEXTRAPATH_class-nativesdk = " -I ${STAGING_DATADIR_NATIVE}/aclocal/" python autotools_aclocals () { - # Refresh variable with cache files d.setVar("CONFIG_SITE", siteinfo_get_files(d, sysrootcache=True)) } diff --git a/poky/meta/classes/icecc.bbclass b/poky/meta/classes/icecc.bbclass index 78a2f7602..fc82f8de1 100644 --- a/poky/meta/classes/icecc.bbclass +++ b/poky/meta/classes/icecc.bbclass @@ -73,10 +73,13 @@ ICECC_ENV_DEBUG ??= "" # # libgcc-initial - fails with CPP sanity check error if host sysroot contains # cross gcc built for another target tune/variant +# systemtap - _HelperSDT.c undefs macros and uses the identifiers in macros emitting +# inline assembly # target-sdk-provides-dummy - ${HOST_PREFIX} is empty which triggers the "NULL # prefix" error. ICECC_SYSTEM_PACKAGE_BL += "\ libgcc-initial \ + systemtap \ target-sdk-provides-dummy \ " diff --git a/poky/meta/classes/image.bbclass b/poky/meta/classes/image.bbclass index 7fa4ff20b..f4633da3d 100644 --- a/poky/meta/classes/image.bbclass +++ b/poky/meta/classes/image.bbclass @@ -526,7 +526,7 @@ def get_rootfs_size(d): base_size = size_kb * overhead_factor bb.debug(1, '%f = %d * %f' % (base_size, size_kb, overhead_factor)) base_size2 = max(base_size, rootfs_req_size) + rootfs_extra_space - bb.debug(1, '%f = max(%f, %d)[%f] + %d' % (base_size2, base_size, rootfs_req_size, max(base_size, rootfs_req_size), overhead_factor)) + bb.debug(1, '%f = max(%f, %d)[%f] + %d' % (base_size2, base_size, rootfs_req_size, max(base_size, rootfs_req_size), rootfs_extra_space)) base_size = base_size2 if base_size != int(base_size): diff --git a/poky/meta/classes/kernel.bbclass b/poky/meta/classes/kernel.bbclass index bf3674238..ebcb79a52 100644 --- a/poky/meta/classes/kernel.bbclass +++ b/poky/meta/classes/kernel.bbclass @@ -96,8 +96,10 @@ python __anonymous () { d.setVar('ALLOW_EMPTY_%s-image-%s' % (kname, typelower), '1') image = d.getVar('INITRAMFS_IMAGE') - image_bundle = d.getVar('INITRAMFS_IMAGE_BUNDLE') - if image and bb.utils.to_boolean(image_bundle, False): + # If the INTIRAMFS_IMAGE is set but the INITRAMFS_IMAGE_BUNDLE is set to 0, + # the do_bundle_initramfs does nothing, but the INITRAMFS_IMAGE is built + # standalone for use by wic and other tools. + if image: d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete') # NOTE: setting INITRAMFS_TASK is for backward compatibility diff --git a/poky/meta/classes/package.bbclass b/poky/meta/classes/package.bbclass index 114d6559f..aa8451ffe 100644 --- a/poky/meta/classes/package.bbclass +++ b/poky/meta/classes/package.bbclass @@ -1646,7 +1646,8 @@ python package_do_shlibs() { prov = (this_soname, ldir, pkgver) if not prov in sonames: # if library is private (only used by package) then do not build shlib for it - if not private_libs or this_soname not in private_libs: + import fnmatch + if not private_libs or len([i for i in private_libs if fnmatch.fnmatch(this_soname, i)]) == 0: sonames.add(prov) if libdir_re.match(os.path.dirname(file)): needs_ldconfig = True @@ -1829,7 +1830,8 @@ python package_do_shlibs() { # /opt/abc/lib/libfoo.so.1 and contains /usr/bin/abc depending on system library libfoo.so.1 # but skipping it is still better alternative than providing own # version and then adding runtime dependency for the same system library - if private_libs and n[0] in private_libs: + import fnmatch + if private_libs and len([i for i in private_libs if fnmatch.fnmatch(n[0], i)]) > 0: bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0])) continue if n[0] in shlib_provider.keys(): diff --git a/poky/meta/classes/python3native.bbclass b/poky/meta/classes/python3native.bbclass index a3acaf61b..d98fb4c75 100644 --- a/poky/meta/classes/python3native.bbclass +++ b/poky/meta/classes/python3native.bbclass @@ -9,6 +9,14 @@ DEPENDS_append = " python3-native " export STAGING_INCDIR export STAGING_LIBDIR +# Packages can use +# find_package(PythonInterp REQUIRED) +# find_package(PythonLibs REQUIRED) +# which ends up using libs/includes from build host +# Therefore pre-empt that effort +export PYTHON_LIBRARY="${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so" +export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" + export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata" # suppress host user's site-packages dirs. diff --git a/poky/meta/classes/pythonnative.bbclass b/poky/meta/classes/pythonnative.bbclass index ae6600cd1..0e9019d1e 100644 --- a/poky/meta/classes/pythonnative.bbclass +++ b/poky/meta/classes/pythonnative.bbclass @@ -12,6 +12,14 @@ DEPENDS_append = " python-native " export STAGING_INCDIR export STAGING_LIBDIR +# Packages can use +# find_package(PythonInterp REQUIRED) +# find_package(PythonLibs REQUIRED) +# which ends up using libs/includes from build host +# Therefore pre-empt that effort +export PYTHON_LIBRARY="${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so" +export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" + # suppress host user's site-packages dirs. export PYTHONNOUSERSITE = "1" diff --git a/poky/meta/classes/rm_work.bbclass b/poky/meta/classes/rm_work.bbclass index c478f4a18..a6bd3f719 100644 --- a/poky/meta/classes/rm_work.bbclass +++ b/poky/meta/classes/rm_work.bbclass @@ -121,7 +121,7 @@ do_rm_work_all () { } do_rm_work_all[recrdeptask] = "do_rm_work" do_rm_work_all[noexec] = "1" -addtask rm_work_all after before do_build +addtask rm_work_all before do_build do_populate_sdk[postfuncs] += "rm_work_populatesdk" rm_work_populatesdk () { diff --git a/poky/meta/classes/rootfs-postcommands.bbclass b/poky/meta/classes/rootfs-postcommands.bbclass index 6cec23ef1..fc338161c 100644 --- a/poky/meta/classes/rootfs-postcommands.bbclass +++ b/poky/meta/classes/rootfs-postcommands.bbclass @@ -95,6 +95,11 @@ read_only_rootfs_hook () { sed -i -e '/^[#[:space:]]*\/dev\/root/{s/defaults/ro/;s/\([[:space:]]*[[:digit:]]\)\([[:space:]]*\)[[:digit:]]$/\1\20/}' ${IMAGE_ROOTFS}/etc/fstab fi + # Tweak the "mount -o remount,rw /" command in busybox-inittab inittab + if [ -f ${IMAGE_ROOTFS}/etc/inittab ]; then + sed -i 's|/bin/mount -o remount,rw /|/bin/mount -o remount,ro /|' ${IMAGE_ROOTFS}/etc/inittab + fi + # If we're using openssh and the /etc/ssh directory has no pre-generated keys, # we should configure openssh to use the configuration file /etc/ssh/sshd_config_readonly # and the keys under /var/run/ssh. diff --git a/poky/meta/classes/staging.bbclass b/poky/meta/classes/staging.bbclass index cdc342dbb..55a9b52ed 100644 --- a/poky/meta/classes/staging.bbclass +++ b/poky/meta/classes/staging.bbclass @@ -197,7 +197,7 @@ def staging_populate_sysroot_dir(targetsysroot, nativesysroot, native, d): for pkgarch in pkgarchs: for manifest in glob.glob(d.expand("${SSTATE_MANIFESTS}/manifest-%s-*.populate_sysroot" % pkgarch)): if manifest.endswith("-initial.populate_sysroot"): - # skip glibc-initial and libgcc-initial due to file overlap + # skip libgcc-initial due to file overlap continue if not native and (manifest.endswith("-native.populate_sysroot") or "nativesdk-" in manifest): continue diff --git a/poky/meta/conf/bitbake.conf b/poky/meta/conf/bitbake.conf index 1311e6b5f..a0a7f4911 100644 --- a/poky/meta/conf/bitbake.conf +++ b/poky/meta/conf/bitbake.conf @@ -360,12 +360,6 @@ CACHE = "${TMPDIR}/cache${@['', '/' + str(d.getVar('MACHINE'))][bool(d.getVar('M # The persistent cache should be shared by all builds PERSISTENT_DIR = "${TOPDIR}/cache" LOG_DIR = "${TMPDIR}/log" -CO_DIR = "${DL_DIR}" -CVSDIR = "${CO_DIR}/cvs" -SVNDIR = "${CO_DIR}/svn" -GITDIR = "${CO_DIR}/git2" -BZRDIR = "${CO_DIR}/bzr" -HGDIR = "${CO_DIR}/hg" STAMPS_DIR ?= "${TMPDIR}/stamps" STAMP = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}" @@ -676,12 +670,6 @@ SRC_URI[vardepsexclude] += "\ # export DEBIAN_MIRROR = "http://ftp.de.debian.org/debian/pool" # into your local.conf -FETCHCMD_svn = "/usr/bin/env svn --non-interactive --trust-server-cert" -FETCHCMD_cvs = "/usr/bin/env cvs" -FETCHCMD_wget = "/usr/bin/env wget -t 2 -T 30 --passive-ftp --no-check-certificate" -FETCHCMD_bzr = "/usr/bin/env bzr" -FETCHCMD_hg = "/usr/bin/env hg" - SRCDATE = "${DATE}" SRCREV ??= "INVALID" AUTOREV = "${@bb.fetch2.get_autorev(d)}" diff --git a/poky/meta/conf/distro/defaultsetup.conf b/poky/meta/conf/distro/defaultsetup.conf index 9b1ee20aa..66fd24652 100644 --- a/poky/meta/conf/distro/defaultsetup.conf +++ b/poky/meta/conf/distro/defaultsetup.conf @@ -1,7 +1,6 @@ include conf/distro/include/default-providers.inc include conf/distro/include/default-versions.inc include conf/distro/include/default-distrovars.inc -include conf/distro/include/world-broken.inc include conf/distro/include/maintainers.inc TCMODE ?= "default" diff --git a/poky/meta/conf/distro/include/default-providers.inc b/poky/meta/conf/distro/include/default-providers.inc index 8f4d44d88..ea88bd487 100644 --- a/poky/meta/conf/distro/include/default-providers.inc +++ b/poky/meta/conf/distro/include/default-providers.inc @@ -5,6 +5,8 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/egl ?= "mesa" PREFERRED_PROVIDER_virtual/libgl ?= "mesa" +PREFERRED_PROVIDER_virtual/libgl-native ?= "mesa-native" +PREFERRED_PROVIDER_virtual/nativesdk-libgl ?= "nativesdk-mesa" PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" PREFERRED_PROVIDER_virtual/mesa ?= "mesa" diff --git a/poky/meta/conf/distro/include/distro_alias.inc b/poky/meta/conf/distro/include/distro_alias.inc index ab6ebdb89..e314642b9 100644 --- a/poky/meta/conf/distro/include/distro_alias.inc +++ b/poky/meta/conf/distro/include/distro_alias.inc @@ -43,9 +43,6 @@ DISTRO_PN_ALIAS_pn-core-image-base = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-clutter = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-full-cmdline = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-kernel-dev = "OE-Core" -DISTRO_PN_ALIAS_pn-core-image-lsb = "OE-Core" -DISTRO_PN_ALIAS_pn-core-image-lsb-dev = "OE-Core" -DISTRO_PN_ALIAS_pn-core-image-lsb-sdk = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-minimal = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-minimal-dev = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-minimal-initramfs = "OE-Core" @@ -80,8 +77,6 @@ DISTRO_PN_ALIAS_pn-docbook-xml-dtd4-native = "Ubuntu=docbook-xml Fedora=docbook- DISTRO_PN_ALIAS_pn-docbook-xsl-stylesheets = "Fedora=docbook-xsl-stylesheets Opensuse=docbook-xsl-stylesheets" DISTRO_PN_ALIAS_pn-dropbear = "Debian=dropbear Ubuntu=dropbear" DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc" -DISTRO_PN_ALIAS_pn-eglinfo-fb = "OE-Core" -DISTRO_PN_ALIAS_pn-eglinfo-x11 = "OE-Core" DISTRO_PN_ALIAS_pn-encodings = "Ubuntu=xfonts-encodings Mandriva=x11-font-encodings Debian=xfonts-encodings" DISTRO_PN_ALIAS_pn-font-alias = "Fedora=xorg-x11-fonts-base Mandriva=x11-font-alias Meego=xorg-x11-fonts" DISTRO_PN_ALIAS_pn-font-util = "Meego=xorg-x11-font-utils Fedora=xorg-x11-font-utils Ubuntu=xfonts-utils Mandriva=x11-font-util Debian=xfonts-utils" @@ -202,8 +197,6 @@ DISTRO_PN_ALIAS_pn-linux-libc-headers-yocto = "Debian=linux-kernel-headers Ubunt DISTRO_PN_ALIAS_pn-linux-yocto = "Debian=linux-base Ubuntu=linux" DISTRO_PN_ALIAS_pn-linux-yocto-rt = "Debian=linux-base Ubuntu=linux" DISTRO_PN_ALIAS_pn-linux-yocto-tiny = "OSPDT" -DISTRO_PN_ALIAS_pn-lsbinitscripts = "Windriver" -DISTRO_PN_ALIAS_pn-lsbtest = "Windriver" DISTRO_PN_ALIAS_pn-ltp = "Mandriva=ltp Ubuntu=ltp" DISTRO_PN_ALIAS_pn-lttng-modules = "OSPDT upstream=http://lttng.org/" DISTRO_PN_ALIAS_pn-lttng-tools = "OSPDT upstream=http://lttng.org/" @@ -265,7 +258,6 @@ DISTRO_PN_ALIAS_pn-packagegroup-core-clutter = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-device-devel = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-eclipse-debug = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-full-cmdline = "OE-Core" -DISTRO_PN_ALIAS_pn-packagegroup-core-lsb = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-nfs = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-sdk = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-ssh-dropbear = "OE-Core" diff --git a/poky/meta/conf/distro/include/maintainers.inc b/poky/meta/conf/distro/include/maintainers.inc index 6a2308d13..5f21f98b2 100644 --- a/poky/meta/conf/distro/include/maintainers.inc +++ b/poky/meta/conf/distro/include/maintainers.inc @@ -66,6 +66,7 @@ RECIPE_MAINTAINER_pn-bind = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-binutils = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-binutils-cross-${TARGET_ARCH} = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj <raj.khem@gmail.com>" +RECIPE_MAINTAINER_pn-binutils-cross-testsuite = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-binutils-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-bison = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-bjam-native = "Alexander Kanavin <alex.kanavin@gmail.com>" @@ -114,8 +115,6 @@ RECIPE_MAINTAINER_pn-core-image-full-cmdline = "Richard Purdie <richard.purdie@l RECIPE_MAINTAINER_pn-core-image-kernel-dev = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-core-image-sato = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-core-image-sato-sdk = "Richard Purdie <richard.purdie@linuxfoundation.org>" -RECIPE_MAINTAINER_pn-core-image-lsb = "Richard Purdie <richard.purdie@linuxfoundation.org>" -RECIPE_MAINTAINER_pn-core-image-lsb-sdk = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-core-image-testmaster-initramfs = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-core-image-testmaster = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-core-image-clutter = "Richard Purdie <richard.purdie@linuxfoundation.org>" @@ -144,6 +143,7 @@ RECIPE_MAINTAINER_pn-dbus-glib = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-dbus-test = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-dbus-wait = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-debianutils = "Yi Zhao <yi.zhao@windriver.com>" +RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi <nathan@nathanrossi.com>" RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Mark Hatle <mark.hatle@windriver.com>" RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia <hongxu.jia@windriver.com>" @@ -165,9 +165,6 @@ RECIPE_MAINTAINER_pn-e2fsprogs = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-ed = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-efivar = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-efibootmgr = "Ross Burton <ross.burton@intel.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-eglinfo-wayland = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-elfutils = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-ell = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" RECIPE_MAINTAINER_pn-enchant = "Anuj Mittal <anuj.mittal@intel.com>" @@ -217,10 +214,10 @@ 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>" RECIPE_MAINTAINER_pn-glibc-mtrace = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-glibc-scripts = "Khem Raj <raj.khem@gmail.com>" +RECIPE_MAINTAINER_pn-glibc-testsuite = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-glide = "Otavio Salvador <otavio.salvador@ossystems.com.br>" RECIPE_MAINTAINER_pn-gmp = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-gnome-desktop-testing = "Ross Burton <ross.burton@intel.com>" @@ -455,9 +452,7 @@ RECIPE_MAINTAINER_pn-linux-yocto-tiny = "Bruce Ashfield <bruce.ashfield@gmail.co RECIPE_MAINTAINER_pn-llvm = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-logrotate = "Yi Zhao <yi.zhao@windriver.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>" +RECIPE_MAINTAINER_pn-lsb-release = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-lsof = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-ltp = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-lttng-modules = "Richard Purdie <richard.purdie@linuxfoundation.org>" diff --git a/poky/meta/conf/distro/include/security_flags.inc b/poky/meta/conf/distro/include/security_flags.inc index 620978a8e..aaf04e9e5 100644 --- a/poky/meta/conf/distro/include/security_flags.inc +++ b/poky/meta/conf/distro/include/security_flags.inc @@ -36,7 +36,7 @@ SECURITY_CFLAGS_remove_powerpc = "${SECURITY_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libgcc_powerpc = "" SECURITY_CFLAGS_pn-glibc = "" -SECURITY_CFLAGS_pn-glibc-initial = "" +SECURITY_CFLAGS_pn-glibc-testsuite = "" SECURITY_CFLAGS_pn-gcc-runtime = "" SECURITY_CFLAGS_pn-grub = "" SECURITY_CFLAGS_pn-grub-efi = "" @@ -60,7 +60,7 @@ TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}" SECURITY_STACK_PROTECTOR_pn-gcc-runtime = "" SECURITY_STACK_PROTECTOR_pn-glibc = "" -SECURITY_STACK_PROTECTOR_pn-glibc-initial = "" +SECURITY_STACK_PROTECTOR_pn-glibc-testsuite = "" # All xorg module drivers need to be linked this way as well and are # handled in recipes-graphics/xorg-driver/xorg-driver-common.inc SECURITY_LDFLAGS_pn-xserver-xorg = "${SECURITY_X_LDFLAGS}" diff --git a/poky/meta/conf/distro/include/tcmode-default.inc b/poky/meta/conf/distro/include/tcmode-default.inc index c89b8e012..d8f434609 100644 --- a/poky/meta/conf/distro/include/tcmode-default.inc +++ b/poky/meta/conf/distro/include/tcmode-default.inc @@ -14,8 +14,6 @@ PREFERRED_PROVIDER_virtual/${SDK_PREFIX}g++ = "gcc-crosssdk-${SDK_SYS}" PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime" # Default libc config -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial" -PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial ?= "nativesdk-glibc-initial" PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" @@ -23,7 +21,7 @@ SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.32%" GDBVERSION ?= "8.3%" GLIBCVERSION ?= "2.30%" -LINUXLIBCVERSION ?= "5.0%" +LINUXLIBCVERSION ?= "5.2%" QEMUVERSION ?= "4.1%" GOVERSION ?= "1.12%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote @@ -62,8 +60,6 @@ PREFERRED_VERSION_glibc-locale ?= "${GLIBCVERSION}" PREFERRED_VERSION_glibc-mtrace ?= "${GLIBCVERSION}" PREFERRED_VERSION_glibc-scripts ?= "${GLIBCVERSION}" PREFERRED_VERSION_nativesdk-glibc ?= "${GLIBCVERSION}" -PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}" -PREFERRED_VERSION_nativesdk-glibc-initial ?= "${GLIBCVERSION}" PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}" PREFERRED_VERSION_qemu ?= "${QEMUVERSION}" diff --git a/poky/meta/conf/distro/include/world-broken.inc b/poky/meta/conf/distro/include/world-broken.inc deleted file mode 100644 index 42cacfdf2..000000000 --- a/poky/meta/conf/distro/include/world-broken.inc +++ /dev/null @@ -1,27 +0,0 @@ -# -# Exclude known broken packages -# - -# rt-tests needs PI mutex support in libc -EXCLUDE_FROM_WORLD_pn-rt-tests_libc-musl = "1" - -# error: use of undeclared identifier '_STAT_VER' -EXCLUDE_FROM_WORLD_pn-pseudo_libc-musl = "1" - -# error: error.h: No such file or directory -EXCLUDE_FROM_WORLD_pn-prelink_libc-musl = "1" - -# error: obstack.h: No such file or directory -EXCLUDE_FROM_WORLD_pn-systemtap_libc-musl = "1" -EXCLUDE_FROM_WORLD_pn-systemtap-uprobes_libc-musl = "1" - -# error: a parameter list without types is only allowed in a function definition -# void (*_function)(sigval_t); -EXCLUDE_FROM_WORLD_pn-qemu_libc-musl = "1" - -# error: format '%s' expects argument of type 'char *', but argument 4 has type 'int' [-Werror=format=] -# snprintf(buf, size, "%s", strerror_r(err, sbuf, sizeof(sbuf))); -EXCLUDE_FROM_WORLD_pn-perf_libc-musl = "1" - -# error: 'RTLD_NEXT' was not declared in this scope -EXCLUDE_FROM_WORLD_pn-gcc-sanitizers_libc-musl = "1" diff --git a/poky/meta/conf/machine/include/arm/feature-arm-thumb.inc b/poky/meta/conf/machine/include/arm/feature-arm-thumb.inc index 0b47ccad0..bae169da3 100644 --- a/poky/meta/conf/machine/include/arm/feature-arm-thumb.inc +++ b/poky/meta/conf/machine/include/arm/feature-arm-thumb.inc @@ -1,8 +1,6 @@ TUNEVALID[thumb] = "Support Thumb instructions" -ARM_THUMB_SUFFIX = "${@bb.utils.contains_any('TUNE_FEATURES', 'armv4 armv5 armv6', 't', 't2', d)}" - # If the device supports ARM, then respect ARM_THUMB_OPT (which can be "arm" or "thumb") # If the device doesn't support ARM, then always set "thumb" even when # some recipe explicitly sets ARM_INSTRUCTION_SET to "arm" @@ -23,6 +21,11 @@ python () { TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' -m${ARM_M_OPT}', '', d)}" +ARM_THUMB_SUFFIX = "t2" +ARM_THUMB_SUFFIX_armv4 = "t" +ARM_THUMB_SUFFIX_armv5 = "t" +ARM_THUMB_SUFFIX_armv6 = "t" + # Add suffix from ARM_THUMB_SUFFIX only if after all this we still set ARM_M_OPT to thumb ARMPKGSFX_THUMB .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${ARM_THUMB_SUFFIX}', '', d) if d.getVar('ARM_M_OPT') == 'thumb' else ''}" diff --git a/poky/meta/conf/machine/include/powerpc/arch-powerpc.inc b/poky/meta/conf/machine/include/powerpc/arch-powerpc.inc index 9cf6b88fd..8c0c94304 100644 --- a/poky/meta/conf/machine/include/powerpc/arch-powerpc.inc +++ b/poky/meta/conf/machine/include/powerpc/arch-powerpc.inc @@ -8,6 +8,11 @@ DEFAULTTUNE ?= "powerpc" TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" ABIEXTENSION ?= "" +# Endian +TUNEVALID[bigendian] = "Use PowerPC Big Endian" + +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}" + TUNEVALID[m32] = "Power ELF32 standard ABI" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'm32', ' -m32', '', d)}" TUNE_ARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'm32', 'powerpc', '', d)}" @@ -22,13 +27,24 @@ TARGET_FPU .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', 'soft', '', d)} TUNEVALID[altivec] = "Altivec" # Basic tune definitions -AVAILTUNES += "powerpc powerpc-nf" -TUNE_FEATURES_tune-powerpc-nf = "m32 fpu-soft" +AVAILTUNES += "powerpc powerpc-nf powerpcle powerpcle-nf" + +TUNE_FEATURES_tune-powerpc-nf = "m32 fpu-soft bigendian" BASE_LIB_tune-powerpc-nf = "lib" TUNE_PKGARCH_tune-powerpc-nf = "powerpc-nf" PACKAGE_EXTRA_ARCHS_tune-powerpc-nf = "powerpc-nf" -TUNE_FEATURES_tune-powerpc = "m32 fpu-hard" +TUNE_FEATURES_tune-powerpc = "m32 fpu-hard bigendian" BASE_LIB_tune-powerpc = "lib" TUNE_PKGARCH_tune-powerpc = "powerpc" PACKAGE_EXTRA_ARCHS_tune-powerpc = "powerpc" + +TUNE_FEATURES_tune-powerpcle-nf = "m32 fpu-soft" +BASE_LIB_tune-powerpcle-nf = "lib" +TUNE_PKGARCH_tune-powerpcle-nf = "powerpcle-nf" +PACKAGE_EXTRA_ARCHS_tune-powerpcle-nf = "powerpcle-nf" + +TUNE_FEATURES_tune-powerpcle = "m32 fpu-hard" +BASE_LIB_tune-powerpcle = "lib" +TUNE_PKGARCH_tune-powerpcle = "powerpcle" +PACKAGE_EXTRA_ARCHS_tune-powerpcle = "powerpcle" diff --git a/poky/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/poky/meta/conf/machine/include/powerpc/arch-powerpc64.inc index d9916d43d..4bc598308 100644 --- a/poky/meta/conf/machine/include/powerpc/arch-powerpc64.inc +++ b/poky/meta/conf/machine/include/powerpc/arch-powerpc64.inc @@ -13,8 +13,14 @@ TUNE_CCARGS .= "${@['', ' -mabi=elfv2']['libc-musl' in d.getVar('OVERRIDES').spl # user mode qemu doesn't support ppc64 MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'm64', 'qemu-usermode', '', d)}" -AVAILTUNES += "powerpc64" -TUNE_FEATURES_tune-powerpc64 = "m64 fpu-hard" +AVAILTUNES += "powerpc64 powerpc64le" + +TUNE_FEATURES_tune-powerpc64 = "m64 fpu-hard bigendian" BASE_LIB_tune-powerpc64 = "lib64" TUNE_PKGARCH_tune-powerpc64 = "powerpc64" PACKAGE_EXTRA_ARCHS_tune-powerpc64 = "powerpc64" + +TUNE_FEATURES_tune-powerpc64le = "m64 fpu-hard" +BASE_LIB_tune-powerpc64le = "lib64" +TUNE_PKGARCH_tune-powerpc64le = "powerpc64le" +PACKAGE_EXTRA_ARCHS_tune-powerpc64le = "powerpc64le" diff --git a/poky/meta/conf/machine/include/qemuboot-mips.inc b/poky/meta/conf/machine/include/qemuboot-mips.inc index a5f9ed821..978820a2e 100644 --- a/poky/meta/conf/machine/include/qemuboot-mips.inc +++ b/poky/meta/conf/machine/include/qemuboot-mips.inc @@ -1,8 +1,7 @@ # For runqemu IMAGE_CLASSES += "qemuboot" -QB_MEM = "-m 256" QB_MACHINE = "-machine malta" QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" -QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -device usb-tablet" +QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" diff --git a/poky/meta/conf/machine/include/qemuboot-x86.inc b/poky/meta/conf/machine/include/qemuboot-x86.inc index 3931b0f0f..495418fa0 100644 --- a/poky/meta/conf/machine/include/qemuboot-x86.inc +++ b/poky/meta/conf/machine/include/qemuboot-x86.inc @@ -9,7 +9,7 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" QB_AUDIO_DRV = "alsa" QB_AUDIO_OPT = "-soundhw ac97,es1370" QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" -QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet" +QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" diff --git a/poky/meta/conf/machine/include/riscv/qemuriscv.inc b/poky/meta/conf/machine/include/riscv/qemuriscv.inc index f1cb62818..df35f2808 100644 --- a/poky/meta/conf/machine/include/riscv/qemuriscv.inc +++ b/poky/meta/conf/machine/include/riscv/qemuriscv.inc @@ -11,7 +11,9 @@ KEEPUIMAGE = "no" SERIAL_CONSOLES ?= "115200;ttyS0 115200;hvc0" -IMAGE_FSTYPES_append = " ext4" +IMAGE_FSTYPES += "ext4 wic.qcow2" + +WKS_FILE ?= "qemuriscv.wks" MACHINE_EXTRA_RRECOMMENDS += " kernel-modules" @@ -24,7 +26,6 @@ UBOOT_ENTRYPOINT_riscv64 = "0x80200000" # qemuboot options QB_KERNEL_CMDLINE_APPEND = "earlycon=sbi" -QB_MEM = "-m 512" QB_MACHINE = "-machine virt" QB_DEFAULT_BIOS = "fw_jump.elf" QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" diff --git a/poky/meta/conf/machine/include/riscv/tune-riscv.inc b/poky/meta/conf/machine/include/riscv/tune-riscv.inc index 1e3a1081e..25d046349 100644 --- a/poky/meta/conf/machine/include/riscv/tune-riscv.inc +++ b/poky/meta/conf/machine/include/riscv/tune-riscv.inc @@ -3,16 +3,16 @@ require conf/machine/include/riscv/arch-riscv.inc TUNEVALID[riscv64] = "Enable 64-bit RISC-V optimizations" TUNEVALID[riscv32] = "Enable 32-bit RISC-V optimizations" -TUNEVALID[littleendian] = "Little endian mode" +TUNEVALID[bigendian] = "Big endian mode" AVAILTUNES += "riscv64 riscv32" -TUNE_FEATURES_tune-riscv64 = "riscv64 littleendian" +TUNE_FEATURES_tune-riscv64 = "riscv64" TUNE_ARCH_tune-riscv64 = "riscv64" TUNE_PKGARCH_tune-riscv64 = "riscv64" PACKAGE_EXTRA_ARCHS_tune-riscv64 = "riscv64" -TUNE_FEATURES_tune-riscv32 = "riscv32 littleendian" +TUNE_FEATURES_tune-riscv32 = "riscv32" TUNE_ARCH_tune-riscv32 = "riscv32" TUNE_PKGARCH_tune-riscv32 = "riscv32" PACKAGE_EXTRA_ARCHS_tune-riscv32 = "riscv32" diff --git a/poky/meta/conf/machine/include/tune-arm1136jf-s.inc b/poky/meta/conf/machine/include/tune-arm1136jf-s.inc index d883eba7c..b25995d49 100644 --- a/poky/meta/conf/machine/include/tune-arm1136jf-s.inc +++ b/poky/meta/conf/machine/include/tune-arm1136jf-s.inc @@ -6,8 +6,11 @@ TUNEVALID[arm1136jfs] = "Enable arm1136jfs specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm1136jfs', ' -mcpu=arm1136jf-s', '', d)}" MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1136jfs', 'armv6:', '' ,d)}" -AVAILTUNES += "arm1136jfs" +AVAILTUNES += "arm1136jfs arm1136jfshf" ARMPKGARCH_tune-arm1136jfs = "arm1136jfs" +ARMPKGARCH_tune-arm1136jfshf = "arm1136jfs" # mcpu is used so don't use armv6 as we don't want march TUNE_FEATURES_tune-arm1136jfs = "arm arm1136jfs" +TUNE_FEATURES_tune-arm1136jfshf = "${TUNE_FEATURES_tune-arm1136jfs} callconvention-hard" PACKAGE_EXTRA_ARCHS_tune-arm1136jfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6} arm1136jfs-vfp" +PACKAGE_EXTRA_ARCHS_tune-arm1136jfshf = "${PACKAGE_EXTRA_ARCHS_tune-armv6hf} arm1136jfshf-vfp" diff --git a/poky/meta/conf/machine/include/tune-arm1176jz-s.inc b/poky/meta/conf/machine/include/tune-arm1176jz-s.inc new file mode 100644 index 000000000..c741e8052 --- /dev/null +++ b/poky/meta/conf/machine/include/tune-arm1176jz-s.inc @@ -0,0 +1,17 @@ +DEFAULTTUNE ?= "arm1176jzs" + +require conf/machine/include/arm/arch-armv6.inc + +TUNEVALID[arm1176jzs] = "Enable arm1176jzs specific processor optimizations" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzs', ' -mcpu=arm1176jz-s', '', d)}" +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzs', 'armv6:', '' ,d)}" + +AVAILTUNES += "arm1176jzs" +ARMPKGARCH_tune-arm1176jzs = "arm1176jzs" +TUNE_FEATURES_tune-arm1176jzs = "arm thumb arm1176jzs" +PACKAGE_EXTRA_ARCHS_tune-arm1176jzs = "${PACKAGE_EXTRA_ARCHS_tune-armv6tb-novfp} arm1176jzs arm1176jzst" + +AVAILTUNES += "arm1176jzs-be" +ARMPKGARCH_tune-arm1176jzs-be = "${ARMPKGARCH_tune-arm1176jzs}" +TUNE_FEATURES_tune-arm1176jzs-be = "${TUNE_FEATURES_tune-arm1176jzs} bigendian" +PACKAGE_EXTRA_ARCHS_tune-arm1176jzs-be = "${PACKAGE_EXTRA_ARCHS_tune-armv6tb-novfp} arm1176jzsb arm1176jzstb" diff --git a/poky/meta/conf/machine/include/tune-ep9312.inc b/poky/meta/conf/machine/include/tune-ep9312.inc index 4d9282162..be20eb363 100644 --- a/poky/meta/conf/machine/include/tune-ep9312.inc +++ b/poky/meta/conf/machine/include/tune-ep9312.inc @@ -2,7 +2,7 @@ DEFAULTTUNE ?= "ep9312" require conf/machine/include/arm/arch-armv4.inc -TUNEVALID[ep9312] = "Enable Intel PXA27x specific processor optimizations" +TUNEVALID[ep9312] = "Enable Cirrus Logic EP9312 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ep9312', ' -march=ep9312 -mcpu=ep9312', '', d)}" MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'ep9312', 'armv4:', '' ,d)}" diff --git a/poky/meta/conf/machine/include/tune-power5.inc b/poky/meta/conf/machine/include/tune-power5.inc index 39501bd8c..48c33fb27 100644 --- a/poky/meta/conf/machine/include/tune-power5.inc +++ b/poky/meta/conf/machine/include/tune-power5.inc @@ -6,12 +6,12 @@ TUNEVALID[power5] = "Enable IBM Power5 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'power5', ' -mcpu=power5', '', d)}" AVAILTUNES += "ppcp5 ppc64p5" -TUNE_FEATURES_tune-ppcp5 = "m32 fpu-hard power5 altivec" +TUNE_FEATURES_tune-ppcp5 = "m32 fpu-hard power5 altivec bigendian" BASE_LIB_tune-ppcp5 = "lib" TUNE_PKGARCH_tune-ppcp5 = "ppcp5" PACKAGE_EXTRA_ARCHS_tune-ppcp5 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppcp5" -TUNE_FEATURES_tune-ppc64p5 = "m64 fpu-hard power5 altivec" +TUNE_FEATURES_tune-ppc64p5 = "m64 fpu-hard power5 altivec bigendian" BASE_LIB_tune-ppc64p5 = "lib64" TUNE_PKGARCH_tune-ppc64p5 = "ppc64p5" PACKAGE_EXTRA_ARCHS_tune-ppc64p5 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64p5" diff --git a/poky/meta/conf/machine/include/tune-power6.inc b/poky/meta/conf/machine/include/tune-power6.inc index 1d5e8ecc2..b70866021 100644 --- a/poky/meta/conf/machine/include/tune-power6.inc +++ b/poky/meta/conf/machine/include/tune-power6.inc @@ -6,12 +6,12 @@ TUNEVALID[power6] = "Enable IBM Power6 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'power6', ' -mcpu=power6', '', d)}" AVAILTUNES += "ppcp6 ppc64p6" -TUNE_FEATURES_tune-ppcp6 = "m32 fpu-hard power6 altivec" +TUNE_FEATURES_tune-ppcp6 = "m32 fpu-hard power6 altivec bigendian" BASE_LIB_tune-ppcp6 = "lib" TUNE_PKGARCH_tune-ppcp6 = "ppcp6" PACKAGE_EXTRA_ARCHS_tune-ppcp6 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppcp6" -TUNE_FEATURES_tune-ppc64p6 = "m64 fpu-hard power6 altivec" +TUNE_FEATURES_tune-ppc64p6 = "m64 fpu-hard power6 altivec bigendian" BASE_LIB_tune-ppc64p6 = "lib64" TUNE_PKGARCH_tune-ppc64p6 = "ppc64p6" PACKAGE_EXTRA_ARCHS_tune-ppc64p6 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64p6" diff --git a/poky/meta/conf/machine/include/tune-power7.inc b/poky/meta/conf/machine/include/tune-power7.inc index 8f3f037eb..e976cc046 100644 --- a/poky/meta/conf/machine/include/tune-power7.inc +++ b/poky/meta/conf/machine/include/tune-power7.inc @@ -6,12 +6,12 @@ TUNEVALID[power7] = "Enable IBM Power7 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'power7', ' -mcpu=power7', '', d)}" AVAILTUNES += "ppcp7 ppc64p7" -TUNE_FEATURES_tune-ppcp7 = "m32 fpu-hard power7 altivec" +TUNE_FEATURES_tune-ppcp7 = "m32 fpu-hard power7 altivec bigendian" BASE_LIB_tune-ppcp7 = "lib" TUNE_PKGARCH_tune-ppcp7 = "ppcp7" PACKAGE_EXTRA_ARCHS_tune-ppcp7 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppcp7" -TUNE_FEATURES_tune-ppc64p7 = "m64 fpu-hard power7 altivec" +TUNE_FEATURES_tune-ppc64p7 = "m64 fpu-hard power7 altivec bigendian" BASE_LIB_tune-ppc64p7 = "lib64" TUNE_PKGARCH_tune-ppc64p7 = "ppc64p7" PACKAGE_EXTRA_ARCHS_tune-ppc64p7 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64p7" diff --git a/poky/meta/conf/machine/include/tune-ppc476.inc b/poky/meta/conf/machine/include/tune-ppc476.inc index d0011ff21..31eecc435 100644 --- a/poky/meta/conf/machine/include/tune-ppc476.inc +++ b/poky/meta/conf/machine/include/tune-ppc476.inc @@ -6,7 +6,7 @@ TUNEVALID[ppc476] = "Enable ppc476 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppc476', ' -mcpu=476', '', d)}" AVAILTUNES += "ppc476" -TUNE_FEATURES_tune-ppc476 = "m32 fpu-hard ppc476" +TUNE_FEATURES_tune-ppc476 = "m32 fpu-hard ppc476 bigendian" TUNE_PKGARCH_tune-ppc476 = "ppc476" PACKAGE_EXTRA_ARCHS_tune-ppc476 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppc476" diff --git a/poky/meta/conf/machine/include/tune-ppc603e.inc b/poky/meta/conf/machine/include/tune-ppc603e.inc index 13f60dd06..b110f1387 100644 --- a/poky/meta/conf/machine/include/tune-ppc603e.inc +++ b/poky/meta/conf/machine/include/tune-ppc603e.inc @@ -6,7 +6,7 @@ TUNEVALID[ppc603e] = "Enable ppc603e specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppc603e', ' -mcpu=603e', '', d)}" AVAILTUNES += "ppc603e" -TUNE_FEATURES_tune-ppc603e = "m32 fpu-hard ppc603e" +TUNE_FEATURES_tune-ppc603e = "m32 fpu-hard ppc603e bigendian" TUNE_PKGARCH_tune-ppc603e = "ppc603e" PACKAGE_EXTRA_ARCHS_tune-ppc603e = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppc603e" diff --git a/poky/meta/conf/machine/include/tune-ppc7400.inc b/poky/meta/conf/machine/include/tune-ppc7400.inc index 425e8bd21..92d902994 100644 --- a/poky/meta/conf/machine/include/tune-ppc7400.inc +++ b/poky/meta/conf/machine/include/tune-ppc7400.inc @@ -6,7 +6,7 @@ TUNEVALID[ppc7400] = "Enable ppc7400 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppc7400', ' -mcpu=7400 -mno-spe', '', d)}" AVAILTUNES += "ppc7400" -TUNE_FEATURES_tune-ppc7400 = "m32 fpu-hard ppc7400 altivec" +TUNE_FEATURES_tune-ppc7400 = "m32 fpu-hard ppc7400 altivec bigendian" TUNE_PKGARCH_tune-ppc7400 = "ppc7400" PACKAGE_EXTRA_ARCHS_tune-ppc7400 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppc7400" diff --git a/poky/meta/conf/machine/include/tune-ppce300c2.inc b/poky/meta/conf/machine/include/tune-ppce300c2.inc index af21f601a..6adeb4bde 100644 --- a/poky/meta/conf/machine/include/tune-ppce300c2.inc +++ b/poky/meta/conf/machine/include/tune-ppce300c2.inc @@ -6,6 +6,6 @@ TUNEVALID[ppce300c2] = "Enable ppce300c2 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppce300c2', ' -mcpu=e300c2', '', d)}" AVAILTUNES += "ppce300c2" -TUNE_FEATURES_tune-ppce300c2 = "m32 fpu-soft ppce300c2" +TUNE_FEATURES_tune-ppce300c2 = "m32 fpu-soft ppce300c2 bigendian" TUNE_PKGARCH_tune-ppce300c2 = "ppce300c2" PACKAGE_EXTRA_ARCHS_tune-ppce300c2 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc-nf} ppce300c2" diff --git a/poky/meta/conf/machine/include/tune-ppce500.inc b/poky/meta/conf/machine/include/tune-ppce500.inc index 89ec3f38a..abf81b90c 100644 --- a/poky/meta/conf/machine/include/tune-ppce500.inc +++ b/poky/meta/conf/machine/include/tune-ppce500.inc @@ -15,6 +15,6 @@ SPEABIEXTENSION = "${@bb.utils.filter('TUNE_FEATURES', 'spe', d)}" ABIEXTENSION .= "${SPEABIEXTENSION}" AVAILTUNES += "ppce500" -TUNE_FEATURES_tune-ppce500 = "m32 spe ppce500" +TUNE_FEATURES_tune-ppce500 = "m32 spe ppce500 bigendian" TUNE_PKGARCH_tune-ppce500 = "ppce500" PACKAGE_EXTRA_ARCHS_tune-ppce500 = "ppce500" diff --git a/poky/meta/conf/machine/include/tune-ppce500mc.inc b/poky/meta/conf/machine/include/tune-ppce500mc.inc index bc26a0f87..9f8a17280 100644 --- a/poky/meta/conf/machine/include/tune-ppce500mc.inc +++ b/poky/meta/conf/machine/include/tune-ppce500mc.inc @@ -6,7 +6,7 @@ TUNEVALID[ppce500mc] = "Enable ppce500mc specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppce500mc', ' -mcpu=e500mc', '', d)}" AVAILTUNES += "ppce500mc" -TUNE_FEATURES_tune-ppce500mc = "m32 fpu-hard ppce500mc" +TUNE_FEATURES_tune-ppce500mc = "m32 fpu-hard ppce500mc bigendian" TUNE_PKGARCH_tune-ppce500mc = "ppce500mc" PACKAGE_EXTRA_ARCHS_tune-ppce500mc = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce500mc" diff --git a/poky/meta/conf/machine/include/tune-ppce500v2.inc b/poky/meta/conf/machine/include/tune-ppce500v2.inc index d318bba36..f6c7c1762 100644 --- a/poky/meta/conf/machine/include/tune-ppce500v2.inc +++ b/poky/meta/conf/machine/include/tune-ppce500v2.inc @@ -15,6 +15,6 @@ SPEABIEXTENSION = "${@bb.utils.filter('TUNE_FEATURES', 'spe', d)}" ABIEXTENSION .= "${SPEABIEXTENSION}" AVAILTUNES += "ppce500v2" -TUNE_FEATURES_tune-ppce500v2 = "m32 ppce500v2" +TUNE_FEATURES_tune-ppce500v2 = "m32 ppce500v2 bigendian" TUNE_PKGARCH_tune-ppce500v2 = "ppce500v2" PACKAGE_EXTRA_ARCHS_tune-ppce500v2 = "ppce500v2" diff --git a/poky/meta/conf/machine/include/tune-ppce5500.inc b/poky/meta/conf/machine/include/tune-ppce5500.inc index cebb24406..acc6a50fc 100644 --- a/poky/meta/conf/machine/include/tune-ppce5500.inc +++ b/poky/meta/conf/machine/include/tune-ppce5500.inc @@ -6,12 +6,12 @@ TUNEVALID[e5500] = "Enable Freescale e5500 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'e5500', ' -mcpu=e5500', '', d)}" AVAILTUNES += "ppce5500 ppc64e5500" -TUNE_FEATURES_tune-ppce5500 = "m32 fpu-hard e5500" +TUNE_FEATURES_tune-ppce5500 = "m32 fpu-hard e5500 bigendian" BASE_LIB_tune-ppce5500 = "lib" TUNE_PKGARCH_tune-ppce5500 = "ppce5500" PACKAGE_EXTRA_ARCHS_tune-ppce5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce5500" -TUNE_FEATURES_tune-ppc64e5500 = "m64 fpu-hard e5500" +TUNE_FEATURES_tune-ppc64e5500 = "m64 fpu-hard e5500 bigendian" BASE_LIB_tune-ppc64e5500 = "lib64" TUNE_PKGARCH_tune-ppc64e5500 = "ppc64e5500" PACKAGE_EXTRA_ARCHS_tune-ppc64e5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64e5500" diff --git a/poky/meta/conf/machine/include/tune-ppce6500.inc b/poky/meta/conf/machine/include/tune-ppce6500.inc index 5db7e760c..d12d218d0 100644 --- a/poky/meta/conf/machine/include/tune-ppce6500.inc +++ b/poky/meta/conf/machine/include/tune-ppce6500.inc @@ -6,12 +6,12 @@ TUNEVALID[e6500] = "Enable Freescale e6500 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'e6500', ' -mcpu=e6500', '', d)}" AVAILTUNES += "ppce6500 ppc64e6500" -TUNE_FEATURES_tune-ppce6500 = "m32 fpu-hard e6500 altivec" +TUNE_FEATURES_tune-ppce6500 = "m32 fpu-hard e6500 altivec bigendian" BASE_LIB_tune-ppce6500 = "lib" TUNE_PKGARCH_tune-ppce6500 = "ppce6500" PACKAGE_EXTRA_ARCHS_tune-ppce6500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce6500" -TUNE_FEATURES_tune-ppc64e6500 = "m64 fpu-hard e6500 altivec" +TUNE_FEATURES_tune-ppc64e6500 = "m64 fpu-hard e6500 altivec bigendian" BASE_LIB_tune-ppc64e6500 = "lib64" TUNE_PKGARCH_tune-ppc64e6500 = "ppc64e6500" PACKAGE_EXTRA_ARCHS_tune-ppc64e6500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64e6500" diff --git a/poky/meta/conf/machine/include/x86-base.inc b/poky/meta/conf/machine/include/x86-base.inc index 686f93823..0227f3c28 100644 --- a/poky/meta/conf/machine/include/x86-base.inc +++ b/poky/meta/conf/machine/include/x86-base.inc @@ -18,7 +18,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0" # kernel-related variables # PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -PREFERRED_VERSION_linux-yocto ??= "5.0%" +PREFERRED_VERSION_linux-yocto ??= "5.2%" # # XSERVER subcomponents, used to build the XSERVER variable diff --git a/poky/meta/conf/machine/qemuarm.conf b/poky/meta/conf/machine/qemuarm.conf index 0a2c99531..26f40b141 100644 --- a/poky/meta/conf/machine/qemuarm.conf +++ b/poky/meta/conf/machine/qemuarm.conf @@ -11,7 +11,6 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" # For runqemu QB_SYSTEM_NAME = "qemu-system-arm" -QB_MEM = "-m 512" QB_MACHINE = "-machine virt" QB_CPU = "-cpu cortex-a15" # Standard Serial console diff --git a/poky/meta/conf/machine/qemuarm64.conf b/poky/meta/conf/machine/qemuarm64.conf index 353ac927d..ec2a887bd 100644 --- a/poky/meta/conf/machine/qemuarm64.conf +++ b/poky/meta/conf/machine/qemuarm64.conf @@ -11,7 +11,6 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" # For runqemu QB_SYSTEM_NAME = "qemu-system-aarch64" -QB_MEM = "-m 512" QB_MACHINE = "-machine virt" QB_CPU = "-cpu cortex-a57" QB_CPU_KVM = "-cpu host" diff --git a/poky/meta/conf/machine/qemuarmv5.conf b/poky/meta/conf/machine/qemuarmv5.conf index 1c21d3342..fb4789fda 100644 --- a/poky/meta/conf/machine/qemuarmv5.conf +++ b/poky/meta/conf/machine/qemuarmv5.conf @@ -17,7 +17,7 @@ QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" -PREFERRED_VERSION_linux-yocto ??= "5.0%" +PREFERRED_VERSION_linux-yocto ??= "5.2%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" KMACHINE_qemuarmv5 = "qemuarm" diff --git a/poky/meta/conf/machine/qemux86-64.conf b/poky/meta/conf/machine/qemux86-64.conf index 4b50e664e..648cf2fe8 100644 --- a/poky/meta/conf/machine/qemux86-64.conf +++ b/poky/meta/conf/machine/qemux86-64.conf @@ -18,12 +18,16 @@ KERNEL_IMAGETYPE = "bzImage" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" +# Install swrast and glx if opengl is in DISTRO_FEATURES and x32 is not in use. +# This is because gallium swrast driver was found to crash X server on startup in qemu x32. XSERVER = "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \ + bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'mesa-driver-swrast xserver-xorg-extension-glx', d), '', d)} \ xf86-video-cirrus \ xf86-video-fbdev \ xf86-video-vmware \ xf86-video-modesetting \ + xf86-video-vesa \ xserver-xorg-module-libint10 \ " diff --git a/poky/meta/conf/machine/qemux86.conf b/poky/meta/conf/machine/qemux86.conf index 3832302f0..8e0da8207 100644 --- a/poky/meta/conf/machine/qemux86.conf +++ b/poky/meta/conf/machine/qemux86.conf @@ -24,6 +24,7 @@ XSERVER = "xserver-xorg \ xf86-video-fbdev \ xf86-video-vmware \ xf86-video-modesetting \ + xf86-video-vesa \ xserver-xorg-module-libint10 \ " diff --git a/poky/meta/files/common-licenses/BSD-2-Clause b/poky/meta/files/common-licenses/BSD-2-Clause index ade0f34d5..f1917d6b7 100644 --- a/poky/meta/files/common-licenses/BSD-2-Clause +++ b/poky/meta/files/common-licenses/BSD-2-Clause @@ -1,13 +1,10 @@ -The FreeBSD Copyright - -Copyright 1992-2010 The FreeBSD Project. All rights reserved. +Copyright <YEAR> <COPYRIGHT HOLDER> Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT ``AS IS`` AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -The views and conclusions contained in the software and documentation are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/poky/meta/lib/oe/gpg_sign.py b/poky/meta/lib/oe/gpg_sign.py index d7624804d..7634d7ef1 100644 --- a/poky/meta/lib/oe/gpg_sign.py +++ b/poky/meta/lib/oe/gpg_sign.py @@ -6,7 +6,6 @@ import os import bb -import oe.utils import subprocess import shlex diff --git a/poky/meta/lib/oeqa/core/context.py b/poky/meta/lib/oeqa/core/context.py index 68819cc33..14fc6a54f 100644 --- a/poky/meta/lib/oeqa/core/context.py +++ b/poky/meta/lib/oeqa/core/context.py @@ -64,12 +64,12 @@ class OETestContext(object): setattr(tclass, 'setUpHooker', skipfuncgen('Skip by the command line argument "%s"' % skip)) def loadTests(self, module_paths, modules=[], tests=[], - modules_manifest="", modules_required=[], filters={}): + modules_manifest="", modules_required=[], **kwargs): if modules_manifest: modules = self._read_modules_from_manifest(modules_manifest) self.loader = self.loaderClass(self, module_paths, modules, tests, - modules_required, filters) + modules_required, **kwargs) self.suites = self.loader.discover() def runTests(self, processes=None, skips=[]): diff --git a/poky/meta/lib/oeqa/core/decorator/__init__.py b/poky/meta/lib/oeqa/core/decorator/__init__.py index 923b21826..1a82518ab 100644 --- a/poky/meta/lib/oeqa/core/decorator/__init__.py +++ b/poky/meta/lib/oeqa/core/decorator/__init__.py @@ -6,6 +6,7 @@ from functools import wraps from abc import abstractmethod, ABCMeta +from oeqa.core.utils.misc import strToList decoratorClasses = set() @@ -63,12 +64,16 @@ class OETestDiscover(OETestDecorator): def discover(registry): return registry['cases'] -class OETestFilter(OETestDecorator): +def OETestTag(*tags): + expandedtags = [] + for tag in tags: + expandedtags += strToList(tag) + def decorator(item): + if hasattr(item, "__oeqa_testtags"): + # do not append, create a new list (to handle classes with inheritance) + item.__oeqa_testtags = list(item.__oeqa_testtags) + expandedtags + else: + item.__oeqa_testtags = expandedtags + return item + return decorator - # OETestLoader call it while loading the tests - # in loadTestsFromTestCase method, it needs to - # return a bool, True if needs to be filtered. - # This method must consume the filter used. - @abstractmethod - def filtrate(self, filters): - return False diff --git a/poky/meta/lib/oeqa/core/decorator/oetag.py b/poky/meta/lib/oeqa/core/decorator/oetag.py deleted file mode 100644 index 8c31138da..000000000 --- a/poky/meta/lib/oeqa/core/decorator/oetag.py +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (C) 2016 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -from . import OETestFilter, registerDecorator -from oeqa.core.utils.misc import strToList - -def _tagFilter(tags, filters): - return False if set(tags) & set(filters) else True - -@registerDecorator -class OETestTag(OETestFilter): - attrs = ('oetag',) - - def bind(self, registry, case): - super(OETestTag, self).bind(registry, case) - self.oetag = strToList(self.oetag, 'oetag') - - def filtrate(self, filters): - if filters.get('oetag'): - filterx = strToList(filters['oetag'], 'oetag') - del filters['oetag'] - if _tagFilter(self.oetag, filterx): - return True - return False diff --git a/poky/meta/lib/oeqa/core/loader.py b/poky/meta/lib/oeqa/core/loader.py index 7fea0585c..0d7970d49 100644 --- a/poky/meta/lib/oeqa/core/loader.py +++ b/poky/meta/lib/oeqa/core/loader.py @@ -16,7 +16,7 @@ from oeqa.core.utils.test import getSuiteModules, getCaseID from oeqa.core.exception import OEQATestNotFound from oeqa.core.case import OETestCase from oeqa.core.decorator import decoratorClasses, OETestDecorator, \ - OETestFilter, OETestDiscover + OETestDiscover # When loading tests, the unittest framework stores any exceptions and # displays them only when the run method is called. @@ -68,7 +68,7 @@ class OETestLoader(unittest.TestLoader): '_top_level_dir'] def __init__(self, tc, module_paths, modules, tests, modules_required, - filters, *args, **kwargs): + *args, **kwargs): self.tc = tc self.modules = _built_modules_dict(modules) @@ -76,13 +76,7 @@ class OETestLoader(unittest.TestLoader): self.tests = tests self.modules_required = modules_required - self.filters = filters - self.decorator_filters = [d for d in decoratorClasses if \ - issubclass(d, OETestFilter)] - self._validateFilters(self.filters, self.decorator_filters) - self.used_filters = [d for d in self.decorator_filters - for f in self.filters - if f in d.attrs] + self.tags_filter = kwargs.get("tags_filter", None) if isinstance(module_paths, str): module_paths = [module_paths] @@ -104,28 +98,6 @@ class OETestLoader(unittest.TestLoader): setattr(testCaseClass, 'td', self.tc.td) setattr(testCaseClass, 'logger', self.tc.logger) - def _validateFilters(self, filters, decorator_filters): - # Validate if filter isn't empty - for key,value in filters.items(): - if not value: - raise TypeError("Filter %s specified is empty" % key) - - # Validate unique attributes - attr_filters = [attr for clss in decorator_filters \ - for attr in clss.attrs] - dup_attr = [attr for attr in attr_filters - if attr_filters.count(attr) > 1] - if dup_attr: - raise TypeError('Detected duplicated attribute(s) %s in filter' - ' decorators' % ' ,'.join(dup_attr)) - - # Validate if filter is supported - for f in filters: - if f not in attr_filters: - classes = ', '.join([d.__name__ for d in decorator_filters]) - raise TypeError('Found "%s" filter but not declared in any of ' - '%s decorators' % (f, classes)) - def _registerTestCase(self, case): case_id = case.id() self.tc._registry['cases'][case_id] = case @@ -188,19 +160,20 @@ class OETestLoader(unittest.TestLoader): return True # Decorator filters - if self.filters and isinstance(case, OETestCase): - filters = self.filters.copy() - case_decorators = [cd for cd in case.decorators - if cd.__class__ in self.used_filters] - - # Iterate over case decorators to check if needs to be filtered. - for cd in case_decorators: - if cd.filtrate(filters): - return True - - # Case is missing one or more decorators for all the filters - # being used, so filter test case. - if filters: + if self.tags_filter is not None and callable(self.tags_filter): + alltags = set() + # pull tags from the case class + if hasattr(case, "__oeqa_testtags"): + for t in getattr(case, "__oeqa_testtags"): + alltags.add(t) + # pull tags from the method itself + if hasattr(case, test_name): + method = getattr(case, test_name) + if hasattr(method, "__oeqa_testtags"): + for t in getattr(method, "__oeqa_testtags"): + alltags.add(t) + + if self.tags_filter(alltags): return True return False diff --git a/poky/meta/lib/oeqa/core/runner.py b/poky/meta/lib/oeqa/core/runner.py index 930620ea1..f656e1a9c 100644 --- a/poky/meta/lib/oeqa/core/runner.py +++ b/poky/meta/lib/oeqa/core/runner.py @@ -43,6 +43,7 @@ class OETestResult(_TestResult): self.starttime = {} self.endtime = {} self.progressinfo = {} + self.extraresults = {} # Inject into tc so that TestDepends decorator can see results tc.results = self @@ -129,19 +130,51 @@ class OETestResult(_TestResult): return 'UNKNOWN', None - def addSuccess(self, test): + def extractExtraResults(self, test, details = None): + extraresults = None + if details is not None and "extraresults" in details: + extraresults = details.get("extraresults", {}) + elif hasattr(test, "extraresults"): + extraresults = test.extraresults + + if extraresults is not None: + for k, v in extraresults.items(): + # handle updating already existing entries (e.g. ptestresults.sections) + if k in self.extraresults: + self.extraresults[k].update(v) + else: + self.extraresults[k] = v + + def addError(self, test, *args, details = None): + self.extractExtraResults(test, details = details) + return super(OETestResult, self).addError(test, *args) + + def addFailure(self, test, *args, details = None): + self.extractExtraResults(test, details = details) + return super(OETestResult, self).addFailure(test, *args) + + def addSuccess(self, test, details = None): #Added so we can keep track of successes too self.successes.append((test, None)) - super(OETestResult, self).addSuccess(test) + self.extractExtraResults(test, details = details) + return super(OETestResult, self).addSuccess(test) + + def addExpectedFailure(self, test, *args, details = None): + self.extractExtraResults(test, details = details) + return super(OETestResult, self).addExpectedFailure(test, *args) + + def addUnexpectedSuccess(self, test, details = None): + self.extractExtraResults(test, details = details) + return super(OETestResult, self).addUnexpectedSuccess(test) def logDetails(self, json_file_dir=None, configuration=None, result_id=None, dump_streams=False): self.tc.logger.info("RESULTS:") - result = {} + result = self.extraresults logs = {} if hasattr(self.tc, "extraresults"): - result = self.tc.extraresults + result.update(self.tc.extraresults) for case_name in self.tc._registry['cases']: case = self.tc._registry['cases'][case_name] @@ -205,23 +238,20 @@ class OETestRunner(_TestRunner): self._walked_cases = self._walked_cases + 1 def _list_tests_name(self, suite): - from oeqa.core.decorator.oetag import OETestTag - self._walked_cases = 0 def _list_cases(logger, case): - oetag = None - - if hasattr(case, 'decorators'): - for d in case.decorators: - if isinstance(d, OETestTag): - oetag = d.oetag - - logger.info("%s\t\t%s" % (oetag, case.id())) + oetags = [] + if hasattr(case, '__oeqa_testtags'): + oetags = getattr(case, '__oeqa_testtags') + if oetags: + logger.info("%s (%s)" % (case.id(), ",".join(oetags))) + else: + logger.info("%s" % (case.id())) self.tc.logger.info("Listing all available tests:") self._walked_cases = 0 - self.tc.logger.info("id\ttag\t\ttest") + self.tc.logger.info("test (tags)") self.tc.logger.info("-" * 80) self._walk_suite(suite, _list_cases) self.tc.logger.info("-" * 80) diff --git a/poky/meta/lib/oeqa/core/tests/cases/data.py b/poky/meta/lib/oeqa/core/tests/cases/data.py index 0d8de87ae..61f88547f 100644 --- a/poky/meta/lib/oeqa/core/tests/cases/data.py +++ b/poky/meta/lib/oeqa/core/tests/cases/data.py @@ -5,7 +5,7 @@ # from oeqa.core.case import OETestCase -from oeqa.core.decorator.oetag import OETestTag +from oeqa.core.decorator import OETestTag from oeqa.core.decorator.data import OETestDataDepends class DataTest(OETestCase): diff --git a/poky/meta/lib/oeqa/core/tests/cases/oetag.py b/poky/meta/lib/oeqa/core/tests/cases/oetag.py index 4e1d08098..52f97dfda 100644 --- a/poky/meta/lib/oeqa/core/tests/cases/oetag.py +++ b/poky/meta/lib/oeqa/core/tests/cases/oetag.py @@ -5,10 +5,9 @@ # from oeqa.core.case import OETestCase -from oeqa.core.decorator.oetag import OETestTag +from oeqa.core.decorator import OETestTag class TagTest(OETestCase): - @OETestTag('goodTag') def testTagGood(self): self.assertTrue(True, msg='How is this possible?') @@ -17,5 +16,23 @@ class TagTest(OETestCase): def testTagOther(self): self.assertTrue(True, msg='How is this possible?') + @OETestTag('otherTag', 'multiTag') + def testTagOtherMulti(self): + self.assertTrue(True, msg='How is this possible?') + def testTagNone(self): self.assertTrue(True, msg='How is this possible?') + +@OETestTag('classTag') +class TagClassTest(OETestCase): + @OETestTag('otherTag') + def testTagOther(self): + self.assertTrue(True, msg='How is this possible?') + + @OETestTag('otherTag', 'multiTag') + def testTagOtherMulti(self): + self.assertTrue(True, msg='How is this possible?') + + def testTagNone(self): + self.assertTrue(True, msg='How is this possible?') + diff --git a/poky/meta/lib/oeqa/core/tests/common.py b/poky/meta/lib/oeqa/core/tests/common.py index 39efd504c..88cc758ad 100644 --- a/poky/meta/lib/oeqa/core/tests/common.py +++ b/poky/meta/lib/oeqa/core/tests/common.py @@ -30,9 +30,9 @@ class TestBase(unittest.TestCase): directory = os.path.dirname(os.path.abspath(__file__)) self.cases_path = os.path.join(directory, 'cases') - def _testLoader(self, d={}, modules=[], tests=[], filters={}): + def _testLoader(self, d={}, modules=[], tests=[], **kwargs): from oeqa.core.context import OETestContext tc = OETestContext(d, self.logger) tc.loadTests(self.cases_path, modules=modules, tests=tests, - filters=filters) + **kwargs) return tc diff --git a/poky/meta/lib/oeqa/core/tests/test_data.py b/poky/meta/lib/oeqa/core/tests/test_data.py index 50811bb38..ac74098b7 100755 --- a/poky/meta/lib/oeqa/core/tests/test_data.py +++ b/poky/meta/lib/oeqa/core/tests/test_data.py @@ -22,8 +22,9 @@ class TestData(TestBase): expectedException = "oeqa.core.exception.OEQAMissingVariable" tc = self._testLoader(modules=self.modules) - self.assertEqual(False, tc.runTests().wasSuccessful()) - for test, data in tc.errors: + results = tc.runTests() + self.assertFalse(results.wasSuccessful()) + for test, data in results.errors: expect = False if expectedException in data: expect = True @@ -35,8 +36,9 @@ class TestData(TestBase): d = {'IMAGE' : 'core-image-sato', 'ARCH' : 'arm'} tc = self._testLoader(d=d, modules=self.modules) - self.assertEqual(False, tc.runTests().wasSuccessful()) - for test, data in tc.failures: + results = tc.runTests() + self.assertFalse(results.wasSuccessful()) + for test, data in results.failures: expect = False if expectedError in data: expect = True diff --git a/poky/meta/lib/oeqa/core/tests/test_decorators.py b/poky/meta/lib/oeqa/core/tests/test_decorators.py index 499cd66ff..b798bf7d3 100755 --- a/poky/meta/lib/oeqa/core/tests/test_decorators.py +++ b/poky/meta/lib/oeqa/core/tests/test_decorators.py @@ -14,35 +14,58 @@ setup_sys_path() from oeqa.core.exception import OEQADependency from oeqa.core.utils.test import getCaseMethod, getSuiteCasesNames, getSuiteCasesIDs -class TestFilterDecorator(TestBase): - - def _runFilterTest(self, modules, filters, expect, msg): - tc = self._testLoader(modules=modules, filters=filters) - test_loaded = set(getSuiteCasesNames(tc.suites)) - self.assertEqual(expect, test_loaded, msg=msg) +class TestTagDecorator(TestBase): + def _runTest(self, modules, filterfn, expect): + tc = self._testLoader(modules = modules, tags_filter = filterfn) + test_loaded = set(getSuiteCasesIDs(tc.suites)) + self.assertEqual(expect, test_loaded) def test_oetag(self): - # Get all cases without filtering. - filter_all = {} - test_all = {'testTagGood', 'testTagOther', 'testTagNone'} - msg_all = 'Failed to get all oetag cases without filtering.' - - # Get cases with 'goodTag'. - filter_good = {'oetag':'goodTag'} - test_good = {'testTagGood'} - msg_good = 'Failed to get just one test filtering with "goodTag" oetag.' - - # Get cases with an invalid tag. - filter_invalid = {'oetag':'invalidTag'} - test_invalid = set() - msg_invalid = 'Failed to filter all test using an invalid oetag.' - - tests = ((filter_all, test_all, msg_all), - (filter_good, test_good, msg_good), - (filter_invalid, test_invalid, msg_invalid)) - - for test in tests: - self._runFilterTest(['oetag'], test[0], test[1], test[2]) + # get all cases without any filtering + self._runTest(['oetag'], None, { + 'oetag.TagTest.testTagGood', + 'oetag.TagTest.testTagOther', + 'oetag.TagTest.testTagOtherMulti', + 'oetag.TagTest.testTagNone', + 'oetag.TagClassTest.testTagOther', + 'oetag.TagClassTest.testTagOtherMulti', + 'oetag.TagClassTest.testTagNone', + }) + + # exclude any case with tags + self._runTest(['oetag'], lambda tags: tags, { + 'oetag.TagTest.testTagNone', + }) + + # exclude any case with otherTag + self._runTest(['oetag'], lambda tags: "otherTag" in tags, { + 'oetag.TagTest.testTagGood', + 'oetag.TagTest.testTagNone', + 'oetag.TagClassTest.testTagNone', + }) + + # exclude any case with classTag + self._runTest(['oetag'], lambda tags: "classTag" in tags, { + 'oetag.TagTest.testTagGood', + 'oetag.TagTest.testTagOther', + 'oetag.TagTest.testTagOtherMulti', + 'oetag.TagTest.testTagNone', + }) + + # include any case with classTag + self._runTest(['oetag'], lambda tags: "classTag" not in tags, { + 'oetag.TagClassTest.testTagOther', + 'oetag.TagClassTest.testTagOtherMulti', + 'oetag.TagClassTest.testTagNone', + }) + + # include any case with classTag or no tags + self._runTest(['oetag'], lambda tags: tags and "classTag" not in tags, { + 'oetag.TagTest.testTagNone', + 'oetag.TagClassTest.testTagOther', + 'oetag.TagClassTest.testTagOtherMulti', + 'oetag.TagClassTest.testTagNone', + }) class TestDependsDecorator(TestBase): modules = ['depends'] diff --git a/poky/meta/lib/oeqa/core/tests/test_loader.py b/poky/meta/lib/oeqa/core/tests/test_loader.py index 519ba9609..cb38ac845 100755 --- a/poky/meta/lib/oeqa/core/tests/test_loader.py +++ b/poky/meta/lib/oeqa/core/tests/test_loader.py @@ -15,31 +15,7 @@ from oeqa.core.exception import OEQADependency from oeqa.core.utils.test import getSuiteModules, getSuiteCasesIDs class TestLoader(TestBase): - - def test_fail_empty_filter(self): - filters = {'oetag' : ''} - expect = 'Filter oetag specified is empty' - msg = 'Expected TypeError exception for having invalid filter' - try: - # Must throw TypeError because empty filter - tc = self._testLoader(filters=filters) - self.fail(msg) - except TypeError as e: - result = True if expect in str(e) else False - self.assertTrue(result, msg=msg) - - def test_fail_invalid_filter(self): - filters = {'invalid' : 'good'} - expect = 'filter but not declared in any of' - msg = 'Expected TypeError exception for having invalid filter' - try: - # Must throw TypeError because invalid filter - tc = self._testLoader(filters=filters) - self.fail(msg) - except TypeError as e: - result = True if expect in str(e) else False - self.assertTrue(result, msg=msg) - + @unittest.skip("invalid directory is missing oetag.py") def test_fail_duplicated_module(self): cases_path = self.cases_path invalid_path = os.path.join(cases_path, 'loader', 'invalid') diff --git a/poky/meta/lib/oeqa/core/utils/concurrencytest.py b/poky/meta/lib/oeqa/core/utils/concurrencytest.py index 6bf771886..fa6fa34b0 100644 --- a/poky/meta/lib/oeqa/core/utils/concurrencytest.py +++ b/poky/meta/lib/oeqa/core/utils/concurrencytest.py @@ -21,6 +21,7 @@ import testtools import threading import time import io +import json import subunit from queue import Queue @@ -28,6 +29,8 @@ from itertools import cycle from subunit import ProtocolTestCase, TestProtocolClient from subunit.test_results import AutoTimingTestResultDecorator from testtools import ThreadsafeForwardingResult, iterate_tests +from testtools.content import Content +from testtools.content_type import ContentType from oeqa.utils.commands import get_test_layer import bb.utils @@ -70,6 +73,58 @@ class BBThreadsafeForwardingResult(ThreadsafeForwardingResult): self.semaphore.release() super(BBThreadsafeForwardingResult, self)._add_result_with_semaphore(method, test, *args, **kwargs) +class ProxyTestResult: + # a very basic TestResult proxy, in order to modify add* calls + def __init__(self, target): + self.result = target + + def _addResult(self, method, test, *args, **kwargs): + return method(test, *args, **kwargs) + + def addError(self, test, *args, **kwargs): + self._addResult(self.result.addError, test, *args, **kwargs) + + def addFailure(self, test, *args, **kwargs): + self._addResult(self.result.addFailure, test, *args, **kwargs) + + def addSuccess(self, test, *args, **kwargs): + self._addResult(self.result.addSuccess, test, *args, **kwargs) + + def addExpectedFailure(self, test, *args, **kwargs): + self._addResult(self.result.addExpectedFailure, test, *args, **kwargs) + + def addUnexpectedSuccess(self, test, *args, **kwargs): + self._addResult(self.result.addUnexpectedSuccess, test, *args, **kwargs) + + def __getattr__(self, attr): + return getattr(self.result, attr) + +class ExtraResultsDecoderTestResult(ProxyTestResult): + def _addResult(self, method, test, *args, **kwargs): + if "details" in kwargs and "extraresults" in kwargs["details"]: + if isinstance(kwargs["details"]["extraresults"], Content): + kwargs = kwargs.copy() + kwargs["details"] = kwargs["details"].copy() + extraresults = kwargs["details"]["extraresults"] + data = bytearray() + for b in extraresults.iter_bytes(): + data += b + extraresults = json.loads(data.decode()) + kwargs["details"]["extraresults"] = extraresults + return method(test, *args, **kwargs) + +class ExtraResultsEncoderTestResult(ProxyTestResult): + def _addResult(self, method, test, *args, **kwargs): + if hasattr(test, "extraresults"): + extras = lambda : [json.dumps(test.extraresults).encode()] + kwargs = kwargs.copy() + if "details" not in kwargs: + kwargs["details"] = {} + else: + kwargs["details"] = kwargs["details"].copy() + kwargs["details"]["extraresults"] = Content(ContentType("application", "json", {'charset': 'utf8'}), extras) + return method(test, *args, **kwargs) + # # We have to patch subunit since it doesn't understand how to handle addError # outside of a running test case. This can happen if classSetUp() fails @@ -116,7 +171,9 @@ class ConcurrentTestSuite(unittest.TestSuite): result.threadprogress = {} for i, (test, testnum) in enumerate(tests): result.threadprogress[i] = [] - process_result = BBThreadsafeForwardingResult(result, semaphore, i, testnum, totaltests) + process_result = BBThreadsafeForwardingResult( + ExtraResultsDecoderTestResult(result), + semaphore, i, testnum, totaltests) # Force buffering of stdout/stderr so the console doesn't get corrupted by test output # as per default in parent code process_result.buffer = True @@ -231,7 +288,7 @@ def fork_for_tests(concurrency_num, suite): # as per default in parent code subunit_client.buffer = True subunit_result = AutoTimingTestResultDecorator(subunit_client) - process_suite.run(subunit_result) + process_suite.run(ExtraResultsEncoderTestResult(subunit_result)) if ourpid != os.getpid(): os._exit(0) if newbuilddir: diff --git a/poky/meta/lib/oeqa/manual/bsp-hw.json b/poky/meta/lib/oeqa/manual/bsp-hw.json index 4b7c76f70..18cec222f 100644 --- a/poky/meta/lib/oeqa/manual/bsp-hw.json +++ b/poky/meta/lib/oeqa/manual/bsp-hw.json @@ -526,7 +526,7 @@ "expected_results": "" }, "4": { - "action": "check ping status \n\nNote: This TC apply only for core-image-full-cmd and core-image-lsb .", + "action": "check ping status \n\nNote: This TC apply only for core-image-full-cmd.", "expected_results": "ping should always work before/after standby" } }, diff --git a/poky/meta/lib/oeqa/manual/compliance-test.json b/poky/meta/lib/oeqa/manual/compliance-test.json index 8c13b68ec..367a416f0 100644 --- a/poky/meta/lib/oeqa/manual/compliance-test.json +++ b/poky/meta/lib/oeqa/manual/compliance-test.json @@ -1,36 +1,6 @@ [ { "test": { - "@alias": "compliance-test.compliance-test.LSB_subset_test_suite", - "author": [ - { - "email": "corneliux.stoicescu@intel.com", - "name": "corneliux.stoicescu@intel.com" - } - ], - "execution": { - "1": { - "action": "Get lsd-sdk image and install it on target device or start the image(if it is QEMU) with option \"-m 512M\"", - "expected_results": "" - }, - "2": { - "action": "Comment in /opt/lsb-test/session any tests you don't want to run.", - "expected_results": "" - }, - "3": { - "action": "Run /usr/bin/LSB_Test.sh which should download the LSB suite and set it up. Some packages may fail to download because their location changed on ftp.linuxfoundation.org. You need to manually update /opt/lsb-test/packages_list", - "expected_results": "" - }, - "4": { - "action": "Tests should start automatically, you can use the web interface to reconfigure the setup. ", - "expected_results": "Check the result on wiki https://wiki.yoctoproject.org/wiki/LSB_Result No regression failures should be met." - } - }, - "summary": "LSB_subset_test_suite" - } - }, - { - "test": { "@alias": "compliance-test.compliance-test.stress_test_-_Genericx86-64", "author": [ { @@ -40,7 +10,7 @@ ], "execution": { "1": { - "action": "Bootup with core-image-lsb-sdk image", + "action": "Bootup with core-image-sato-sdk image", "expected_results": "" }, "2": { diff --git a/poky/meta/lib/oeqa/manual/crops.json b/poky/meta/lib/oeqa/manual/crops.json index 1cf3c8f30..5cfa65384 100644 --- a/poky/meta/lib/oeqa/manual/crops.json +++ b/poky/meta/lib/oeqa/manual/crops.json @@ -234,16 +234,16 @@ "expected_results": "this should output the directory of the devtool script and it should be within the sdk workdir you are working in. \n\n" }, "5": { - "action": "devtool add v4l2loopback-driver https://github.com/umlaeute/v4l2loopback.git \n\n", - "expected_results": "This should automatically create the recipe v4l2loopback-driver.bb under <crops-esdk-workdir-workspace>/recipes/v4l2loopback-driver/v4l2loopback-driver.bb " + "action": "devtool add kernel-module-hello-world https://git.yoctoproject.org/git/kernel-module-hello-world \n\n", + "expected_results": "This should automatically create the recipe kernel-module-hello-world.bb under <crops-esdk-workdir-workspace>/recipes/kernel-module-hello-world/kernel-module-hello-world.bb " }, "6": { - "action": "devtool build v4l2loopback-driver \n\n", + "action": "devtool build kernel-module-hello-world \n\n", "expected_results": "This should compile an image \n\n" }, "7": { - "action": "devtool reset v4l2loopback-driver ", - "expected_results": "This cleans sysroot of the v4l2loopback-driver recipe, but it leaves the source tree intact. meaning it does not erase." + "action": "devtool reset kernel-module-hello-world ", + "expected_results": "This cleans sysroot of the kernel-module-hello-world recipe, but it leaves the source tree intact. meaning it does not erase." } }, "summary": "sdkext_devtool_kernelmodule" @@ -291,4 +291,4 @@ "summary": "sdkext_recipes_for_nodejs" } } -]
\ No newline at end of file +] diff --git a/poky/meta/lib/oeqa/manual/toaster-managed-mode.json b/poky/meta/lib/oeqa/manual/toaster-managed-mode.json index 812f57da3..12374c7c6 100644 --- a/poky/meta/lib/oeqa/manual/toaster-managed-mode.json +++ b/poky/meta/lib/oeqa/manual/toaster-managed-mode.json @@ -1494,7 +1494,7 @@ "expected_results": "A type in form appears. \n\n\t" }, "6": { - "action": "Change distro (ex: poky-lsb). \n\n\t", + "action": "Change distro (ex: poky-tiny). \n\n\t", "expected_results": "Distro has changed. \n\n\t" }, "7": { @@ -1503,7 +1503,7 @@ }, "8": { "action": " Build a recipe (ex: core-image-minimal) and wait until build finish.", - "expected_results": "Build finishes successfully. \n\nThe 'success' criteria for this one should be that the build is reported as using the poky-lsb distro in the build summary page, and that the DISTRO variable value in the bitbake variables table is set to the value specified in toaster (poky-lsb again)." + "expected_results": "Build finishes successfully. \n\nThe 'success' criteria for this one should be that the build is reported as using the poky-tiny distro in the build summary page, and that the DISTRO variable value in the bitbake variables table is set to the value specified in toaster (poky-tiny again)." } }, "summary": "Build_a_recipe_with_different_distro" @@ -1612,7 +1612,7 @@ "expected_results": "" }, "3": { - "action": "Check that the table is populated with the list of image recipes (eg. core-image minimal, core-image-lsb) \n\n\n", + "action": "Check that the table is populated with the list of image recipes (eg. core-image minimal) \n\n\n", "expected_results": "" }, "4": { @@ -1670,7 +1670,7 @@ "expected_results": "" }, "7": { - "action": "Sort the table by \"Layer\" and then navigate away by selecting an image (such as core-image-lsb). When you click the \"back\" button in the web-browser to go back, the \"New custom image\" table should still be sorted by \"Layer\". \nThis should apply also by navigating back to the page by any other means. \n\n", + "action": "Sort the table by \"Layer\" and then navigate away by selecting an image. When you click the \"back\" button in the web-browser to go back, the \"New custom image\" table should still be sorted by \"Layer\". \nThis should apply also by navigating back to the page by any other means. \n\n", "expected_results": "" }, "8": { @@ -2348,7 +2348,7 @@ "expected_results": "" }, "3": { - "action": "Build 6 recipes example (core-image-sato, core-image-minimal, core-image-base, core-image-lsb, core-image-clutter) to name a few. ", + "action": "Build 6 recipes example (core-image-sato, core-image-minimal, core-image-base, core-image-clutter) to name a few. ", "expected_results": " All recipes are built correctly \n\n" }, "4": { @@ -2382,7 +2382,7 @@ "expected_results": "" }, "3": { - "action": "Build 6 recipes example (core-image-sato, core-image-minimal, core-image-base, core-image-lsb, core-image-clutter) to name a few. \n\n", + "action": "Build 6 recipes example (core-image-sato, core-image-minimal, core-image-base, core-image-clutter) to name a few. \n\n", "expected_results": "All recipes are built correctly \n\n" }, "4": { @@ -2420,7 +2420,7 @@ "expected_results": "" }, "3": { - "action": "Build 4 recipes example (core-image-sato, core-image-minimal, core-image-base, core-image-lsb, core-image-clutter) to name a few. \n\n", + "action": "Build 4 recipes example (core-image-sato, core-image-minimal, core-image-base, core-image-clutter) to name a few. \n\n", "expected_results": " All recipes are built correctly \n\n" }, "4": { diff --git a/poky/meta/lib/oeqa/runtime/cases/dnf.py b/poky/meta/lib/oeqa/runtime/cases/dnf.py index 629b9af3e..80cc86a4f 100644 --- a/poky/meta/lib/oeqa/runtime/cases/dnf.py +++ b/poky/meta/lib/oeqa/runtime/cases/dnf.py @@ -9,7 +9,7 @@ from oeqa.utils.httpserver import HTTPService from oeqa.runtime.case import OERuntimeTestCase from oeqa.core.decorator.depends import OETestDepends -from oeqa.core.decorator.data import skipIfNotDataVar, skipIfNotFeature +from oeqa.core.decorator.data import skipIfNotDataVar, skipIfNotFeature, skipIfInDataVar, skipIfNotInDataVar from oeqa.runtime.decorator.package import OEHasPackage class DnfTest(OERuntimeTestCase): @@ -116,6 +116,7 @@ class DnfRepoTest(DnfTest): self.dnf_with_repo('reinstall -y run-postinsts-dev') @OETestDepends(['dnf.DnfRepoTest.test_dnf_makecache']) + @skipIfInDataVar('DISTRO_FEATURES', 'usrmerge', 'Test run when not enable usrmerge') def test_dnf_installroot(self): rootpath = '/home/root/chroot/test' #Copy necessary files to avoid errors with not yet installed tools on @@ -141,6 +142,37 @@ class DnfRepoTest(DnfTest): self.assertEqual(0, status, output) @OETestDepends(['dnf.DnfRepoTest.test_dnf_makecache']) + @skipIfNotInDataVar('DISTRO_FEATURES', 'usrmerge', 'Test run when enable usrmege') + def test_dnf_installroot_usrmerge(self): + rootpath = '/home/root/chroot/test' + #Copy necessary files to avoid errors with not yet installed tools on + #installroot directory. + self.target.run('mkdir -p %s/etc' % rootpath, 1500) + self.target.run('mkdir -p %s/usr/bin %s/usr/sbin' % (rootpath, rootpath), 1500) + self.target.run('ln -sf -r %s/usr/bin %s/bin' % (rootpath, rootpath), 1500) + self.target.run('ln -sf -r %s/usr/sbin %s/sbin' % (rootpath, rootpath), 1500) + self.target.run('mkdir -p %s/dev' % rootpath, 1500) + #Handle different architectures lib dirs + self.target.run('mkdir -p %s/usr/lib' % rootpath, 1500) + self.target.run('mkdir -p %s/usr/libx32' % rootpath, 1500) + self.target.run('mkdir -p %s/usr/lib64' % rootpath, 1500) + self.target.run('cp /lib/libtinfo.so.5 %s/usr/lib' % rootpath, 1500) + self.target.run('cp /libx32/libtinfo.so.5 %s/usr/libx32' % rootpath, 1500) + self.target.run('cp /lib64/libtinfo.so.5 %s/usr/lib64' % rootpath, 1500) + self.target.run('ln -sf -r %s/lib %s/usr/lib' % (rootpath,rootpath), 1500) + self.target.run('ln -sf -r %s/libx32 %s/usr/libx32' % (rootpath,rootpath), 1500) + self.target.run('ln -sf -r %s/lib64 %s/usr/lib64' % (rootpath,rootpath), 1500) + self.target.run('cp -r /etc/rpm %s/etc' % rootpath, 1500) + self.target.run('cp -r /etc/dnf %s/etc' % rootpath, 1500) + self.target.run('cp /bin/sh %s/bin' % rootpath, 1500) + self.target.run('mount -o bind /dev %s/dev/' % rootpath, 1500) + self.dnf_with_repo('install --installroot=%s -v -y --rpmverbosity=debug busybox run-postinsts' % rootpath) + status, output = self.target.run('test -e %s/var/cache/dnf' % rootpath, 1500) + self.assertEqual(0, status, output) + status, output = self.target.run('test -e %s/bin/busybox' % rootpath, 1500) + self.assertEqual(0, status, output) + + @OETestDepends(['dnf.DnfRepoTest.test_dnf_makecache']) def test_dnf_exclude(self): excludepkg = 'curl-dev' self.dnf_with_repo('install -y curl*') diff --git a/poky/meta/lib/oeqa/runtime/cases/oe_syslog.py b/poky/meta/lib/oeqa/runtime/cases/oe_syslog.py index 3a8271a53..f3c2bedba 100644 --- a/poky/meta/lib/oeqa/runtime/cases/oe_syslog.py +++ b/poky/meta/lib/oeqa/runtime/cases/oe_syslog.py @@ -17,7 +17,7 @@ class SyslogTest(OERuntimeTestCase): msg = "Failed to execute %s" % self.tc.target_cmds['ps'] self.assertEqual(status, 0, msg=msg) msg = "No syslog daemon process; %s output:\n%s" % (self.tc.target_cmds['ps'], output) - hasdaemon = "syslogd" in output or "syslog-ng" in output + hasdaemon = "syslogd" in output or "syslog-ng" in output or "svlogd" in output self.assertTrue(hasdaemon, msg=msg) class SyslogTestConfig(OERuntimeTestCase): diff --git a/poky/meta/lib/oeqa/runtime/cases/parselogs.py b/poky/meta/lib/oeqa/runtime/cases/parselogs.py index 19c9c52a0..15343d7ab 100644 --- a/poky/meta/lib/oeqa/runtime/cases/parselogs.py +++ b/poky/meta/lib/oeqa/runtime/cases/parselogs.py @@ -83,6 +83,10 @@ qemux86_common = [ 'amd_nb: Cannot enumerate AMD northbridges', 'uvesafb: 5000 ms task timeout, infinitely waiting', 'tsc: HPET/PMTIMER calibration failed', + "modeset(0): Failed to initialize the DRI2 extension", + "uvesafb: cannot reserve video memory at", + "uvesafb: probe of uvesafb.0 failed with error", + "glamor initialization failed", ] + common_errors ignore_errors = { diff --git a/poky/meta/lib/oeqa/sdkext/cases/devtool.py b/poky/meta/lib/oeqa/sdkext/cases/devtool.py index 5a02add76..8e92bf806 100644 --- a/poky/meta/lib/oeqa/sdkext/cases/devtool.py +++ b/poky/meta/lib/oeqa/sdkext/cases/devtool.py @@ -73,8 +73,8 @@ class DevtoolTest(OESDKExtTestCase): self._run('devtool reset %s' % recipe) def test_devtool_kernelmodule(self): - docfile = 'https://github.com/umlaeute/v4l2loopback.git' - recipe = 'v4l2loopback-driver' + docfile = 'https://git.yoctoproject.org/git/kernel-module-hello-world' + recipe = 'kernel-module-hello-world' self._run('devtool add %s %s' % (recipe, docfile) ) try: self._run('devtool build %s' % recipe) diff --git a/poky/meta/lib/oeqa/selftest/cases/bbtests.py b/poky/meta/lib/oeqa/selftest/cases/bbtests.py index 0693ba8cf..8e59bafae 100644 --- a/poky/meta/lib/oeqa/selftest/cases/bbtests.py +++ b/poky/meta/lib/oeqa/selftest/cases/bbtests.py @@ -119,7 +119,7 @@ class BitbakeTests(OESelftestTestCase): def test_bitbake_g(self): result = bitbake('-g core-image-minimal') - for f in ['pn-buildlist', 'recipe-depends.dot', 'task-depends.dot']: + for f in ['pn-buildlist', 'task-depends.dot']: self.addCleanup(os.remove, f) self.assertTrue('Task dependencies saved to \'task-depends.dot\'' in result.output, msg = "No task dependency \"task-depends.dot\" file was generated for the given task target. bitbake output: %s" % result.output) self.assertTrue('busybox' in ftools.read_file(os.path.join(self.builddir, 'task-depends.dot')), msg = "No \"busybox\" dependency found in task-depends.dot file.") diff --git a/poky/meta/lib/oeqa/selftest/cases/binutils.py b/poky/meta/lib/oeqa/selftest/cases/binutils.py new file mode 100644 index 000000000..9bc752040 --- /dev/null +++ b/poky/meta/lib/oeqa/selftest/cases/binutils.py @@ -0,0 +1,49 @@ +# SPDX-License-Identifier: MIT +import os +import sys +import re +import logging +from oeqa.core.decorator import OETestTag +from oeqa.selftest.case import OESelftestTestCase +from oeqa.utils.commands import bitbake, get_bb_var, get_bb_vars + +def parse_values(content): + for i in content: + for v in ["PASS", "FAIL", "XPASS", "XFAIL", "UNRESOLVED", "UNSUPPORTED", "UNTESTED", "ERROR", "WARNING"]: + if i.startswith(v + ": "): + yield i[len(v) + 2:].strip(), v + break + +@OETestTag("toolchain-user", "toolchain-system") +class BinutilsCrossSelfTest(OESelftestTestCase): + def test_binutils(self): + self.run_binutils("binutils") + + def test_gas(self): + self.run_binutils("gas") + + def test_ld(self): + self.run_binutils("ld") + + def run_binutils(self, suite): + features = [] + features.append('CHECK_TARGETS = "{0}"'.format(suite)) + self.write_config("\n".join(features)) + + recipe = "binutils-cross-testsuite" + bb_vars = get_bb_vars(["B", "TARGET_SYS", "T"], recipe) + builddir, target_sys, tdir = bb_vars["B"], bb_vars["TARGET_SYS"], bb_vars["T"] + + bitbake("{0} -c check".format(recipe)) + + ptestsuite = "binutils-{}".format(suite) if suite != "binutils" else suite + self.extraresults = {"ptestresult.sections" : {ptestsuite : {}}} + + sumspath = os.path.join(builddir, suite, "{0}.sum".format(suite)) + if not os.path.exists(sumspath): + sumspath = os.path.join(builddir, suite, "testsuite", "{0}.sum".format(suite)) + + with open(sumspath, "r") as f: + for test, result in parse_values(f): + self.extraresults["ptestresult.{}.{}".format(ptestsuite, test)] = {"status" : result} + diff --git a/poky/meta/lib/oeqa/selftest/cases/gcc.py b/poky/meta/lib/oeqa/selftest/cases/gcc.py new file mode 100644 index 000000000..2c25b5904 --- /dev/null +++ b/poky/meta/lib/oeqa/selftest/cases/gcc.py @@ -0,0 +1,139 @@ +# SPDX-License-Identifier: MIT +import os +from oeqa.core.decorator import OETestTag +from oeqa.selftest.case import OESelftestTestCase +from oeqa.utils.commands import bitbake, get_bb_var, get_bb_vars, runqemu, Command + +def parse_values(content): + for i in content: + for v in ["PASS", "FAIL", "XPASS", "XFAIL", "UNRESOLVED", "UNSUPPORTED", "UNTESTED", "ERROR", "WARNING"]: + if i.startswith(v + ": "): + yield i[len(v) + 2:].strip(), v + break + +class GccSelfTestBase(OESelftestTestCase): + def check_skip(self, suite): + targets = get_bb_var("RUNTIMETARGET", "gcc-runtime").split() + if suite not in targets: + self.skipTest("Target does not use {0}".format(suite)) + + def run_check(self, *suites, ssh = None): + targets = set() + for s in suites: + if s in ["gcc", "g++"]: + targets.add("check-gcc") + else: + targets.add("check-target-{}".format(s)) + + # configure ssh target + features = [] + features.append('MAKE_CHECK_TARGETS = "{0}"'.format(" ".join(targets))) + if ssh is not None: + features.append('TOOLCHAIN_TEST_TARGET = "ssh"') + features.append('TOOLCHAIN_TEST_HOST = "{0}"'.format(ssh)) + features.append('TOOLCHAIN_TEST_HOST_USER = "root"') + features.append('TOOLCHAIN_TEST_HOST_PORT = "22"') + self.write_config("\n".join(features)) + + recipe = "gcc-runtime" + bitbake("{} -c check".format(recipe)) + + bb_vars = get_bb_vars(["B", "TARGET_SYS"], recipe) + builddir, target_sys = bb_vars["B"], bb_vars["TARGET_SYS"] + + self.extraresults = {"ptestresult.sections" : {}} + for suite in suites: + sumspath = os.path.join(builddir, "gcc", "testsuite", suite, "{0}.sum".format(suite)) + if not os.path.exists(sumspath): # check in target dirs + sumspath = os.path.join(builddir, target_sys, suite, "testsuite", "{0}.sum".format(suite)) + if not os.path.exists(sumspath): # handle libstdc++-v3 -> libstdc++ + sumspath = os.path.join(builddir, target_sys, suite, "testsuite", "{0}.sum".format(suite.split("-")[0])) + + ptestsuite = "gcc-{}".format(suite) if suite != "gcc" else suite + ptestsuite = ptestsuite + "-user" if ssh is None else ptestsuite + self.extraresults["ptestresult.sections"][ptestsuite] = {} + with open(sumspath, "r") as f: + for test, result in parse_values(f): + self.extraresults["ptestresult.{}.{}".format(ptestsuite, test)] = {"status" : result} + + def run_check_emulated(self, *args, **kwargs): + # build core-image-minimal with required packages + default_installed_packages = ["libgcc", "libstdc++", "libatomic", "libgomp"] + features = [] + features.append('IMAGE_FEATURES += "ssh-server-openssh"') + features.append('CORE_IMAGE_EXTRA_INSTALL += "{0}"'.format(" ".join(default_installed_packages))) + self.write_config("\n".join(features)) + bitbake("core-image-minimal") + + # wrap the execution with a qemu instance + with runqemu("core-image-minimal", runqemuparams = "nographic") as qemu: + # validate that SSH is working + status, _ = qemu.run("uname") + self.assertEqual(status, 0) + + return self.run_check(*args, ssh=qemu.ip, **kwargs) + +@OETestTag("toolchain-user") +class GccCrossSelfTest(GccSelfTestBase): + def test_cross_gcc(self): + self.run_check("gcc", "g++") + +@OETestTag("toolchain-user") +class GccLibAtomicSelfTest(GccSelfTestBase): + def test_libatomic(self): + self.run_check("libatomic") + +@OETestTag("toolchain-user") +class GccLibGompSelfTest(GccSelfTestBase): + def test_libgomp(self): + self.run_check("libgomp") + +@OETestTag("toolchain-user") +class GccLibStdCxxSelfTest(GccSelfTestBase): + def test_libstdcxx(self): + self.run_check("libstdc++-v3") + +@OETestTag("toolchain-user") +class GccLibSspSelfTest(GccSelfTestBase): + def test_libssp(self): + self.check_skip("libssp") + self.run_check("libssp") + +@OETestTag("toolchain-user") +class GccLibItmSelfTest(GccSelfTestBase): + def test_libitm(self): + self.check_skip("libitm") + self.run_check("libitm") + +@OETestTag("toolchain-system") +class GccCrossSelfTestSystemEmulated(GccSelfTestBase): + def test_cross_gcc(self): + self.run_check_emulated("gcc", "g++") + +@OETestTag("toolchain-system") +class GccLibAtomicSelfTestSystemEmulated(GccSelfTestBase): + def test_libatomic(self): + self.run_check_emulated("libatomic") + +@OETestTag("toolchain-system") +class GccLibGompSelfTestSystemEmulated(GccSelfTestBase): + def test_libgomp(self): + self.run_check_emulated("libgomp") + +@OETestTag("toolchain-system") +class GccLibStdCxxSelfTestSystemEmulated(GccSelfTestBase): + def test_libstdcxx(self): + self.run_check_emulated("libstdc++-v3") + +@OETestTag("toolchain-system") +class GccLibSspSelfTestSystemEmulated(GccSelfTestBase): + def test_libssp(self): + self.check_skip("libssp") + self.run_check_emulated("libssp") + +@OETestTag("toolchain-system") +class GccLibItmSelfTestSystemEmulated(GccSelfTestBase): + def test_libitm(self): + self.check_skip("libitm") + self.run_check_emulated("libitm") + diff --git a/poky/meta/lib/oeqa/selftest/cases/glibc.py b/poky/meta/lib/oeqa/selftest/cases/glibc.py new file mode 100644 index 000000000..2e42485dd --- /dev/null +++ b/poky/meta/lib/oeqa/selftest/cases/glibc.py @@ -0,0 +1,88 @@ +# SPDX-License-Identifier: MIT +import os +import contextlib +from oeqa.core.decorator import OETestTag +from oeqa.selftest.case import OESelftestTestCase +from oeqa.utils.commands import bitbake, get_bb_var, get_bb_vars, runqemu, Command +from oeqa.utils.nfs import unfs_server + +def parse_values(content): + for i in content: + for v in ["PASS", "FAIL", "XPASS", "XFAIL", "UNRESOLVED", "UNSUPPORTED", "UNTESTED", "ERROR", "WARNING"]: + if i.startswith(v + ": "): + yield i[len(v) + 2:].strip(), v + break + +class GlibcSelfTestBase(OESelftestTestCase): + def run_check(self, ssh = None): + # configure ssh target + features = [] + if ssh is not None: + features.append('TOOLCHAIN_TEST_TARGET = "ssh"') + features.append('TOOLCHAIN_TEST_HOST = "{0}"'.format(ssh)) + features.append('TOOLCHAIN_TEST_HOST_USER = "root"') + features.append('TOOLCHAIN_TEST_HOST_PORT = "22"') + # force single threaded test execution + features.append('EGLIBCPARALLELISM_task-check_pn-glibc-testsuite = "PARALLELMFLAGS="-j1""') + self.write_config("\n".join(features)) + + bitbake("glibc-testsuite -c check") + + builddir = get_bb_var("B", "glibc-testsuite") + + ptestsuite = "glibc-user" if ssh is None else "glibc" + self.extraresults = {"ptestresult.sections" : {ptestsuite : {}}} + with open(os.path.join(builddir, "tests.sum"), "r") as f: + for test, result in parse_values(f): + self.extraresults["ptestresult.{}.{}".format(ptestsuite, test)] = {"status" : result} + + def run_check_emulated(self): + with contextlib.ExitStack() as s: + # use the base work dir, as the nfs mount, since the recipe directory may not exist + tmpdir = get_bb_var("BASE_WORKDIR") + nfsport, mountport = s.enter_context(unfs_server(tmpdir)) + + # build core-image-minimal with required packages + default_installed_packages = [ + "glibc-charmaps", + "libgcc", + "libstdc++", + "libatomic", + "libgomp", + # "python3", + # "python3-pexpect", + "nfs-utils", + ] + features = [] + features.append('IMAGE_FEATURES += "ssh-server-openssh"') + features.append('CORE_IMAGE_EXTRA_INSTALL += "{0}"'.format(" ".join(default_installed_packages))) + self.write_config("\n".join(features)) + bitbake("core-image-minimal") + + # start runqemu + qemu = s.enter_context(runqemu("core-image-minimal", runqemuparams = "nographic")) + + # validate that SSH is working + status, _ = qemu.run("uname") + self.assertEqual(status, 0) + + # setup nfs mount + if qemu.run("mkdir -p \"{0}\"".format(tmpdir))[0] != 0: + raise Exception("Failed to setup NFS mount directory on target") + mountcmd = "mount -o noac,nfsvers=3,port={0},udp,mountport={1} \"{2}:{3}\" \"{3}\"".format(nfsport, mountport, qemu.server_ip, tmpdir) + status, output = qemu.run(mountcmd) + if status != 0: + raise Exception("Failed to setup NFS mount on target ({})".format(repr(output))) + + self.run_check(ssh = qemu.ip) + +@OETestTag("toolchain-user") +class GlibcSelfTest(GlibcSelfTestBase): + def test_glibc(self): + self.run_check() + +@OETestTag("toolchain-system") +class GlibcSelfTestSystemEmulated(GlibcSelfTestBase): + def test_glibc(self): + self.run_check_emulated() + diff --git a/poky/meta/lib/oeqa/selftest/cases/kerneldevelopment.py b/poky/meta/lib/oeqa/selftest/cases/kerneldevelopment.py new file mode 100644 index 000000000..a61876ee6 --- /dev/null +++ b/poky/meta/lib/oeqa/selftest/cases/kerneldevelopment.py @@ -0,0 +1,67 @@ +import os +from oeqa.selftest.case import OESelftestTestCase +from oeqa.utils.commands import runCmd, get_bb_var +from oeqa.utils.git import GitRepo + +class KernelDev(OESelftestTestCase): + + @classmethod + def setUpClass(cls): + super(KernelDev, cls).setUpClass() + # Create the recipe directory structure inside the created layer + cls.layername = 'meta-kerneltest' + runCmd('bitbake-layers create-layer %s' % cls.layername) + runCmd('mkdir -p %s/recipes-kernel/linux/linux-yocto' % cls.layername) + cls.recipes_linuxyocto_dir = os.path.join \ + (cls.builddir, cls.layername, 'recipes-kernel', 'linux', 'linux-yocto') + cls.recipeskernel_dir = os.path.dirname(cls.recipes_linuxyocto_dir) + runCmd('bitbake-layers add-layer %s' % cls.layername) + + @classmethod + def tearDownClass(cls): + runCmd('bitbake-layers remove-layer %s' % cls.layername, ignore_status=True) + runCmd('rm -rf %s' % cls.layername) + super(KernelDev, cls).tearDownClass() + + def setUp(self): + super(KernelDev, self).setUp() + self.set_machine_config('MACHINE = "qemux86-64"\n') + + def test_apply_patches(self): + """ + Summary: Able to apply a single patch to the Linux kernel source + Expected: The README file should exist and the patch changes should be + displayed at the end of the file. + Product: Kernel Development + Author: Yeoh Ee Peng <ee.peng.yeoh@intel.com> + AutomatedBy: Mazliana Mohamad <mazliana.mohamad@intel.com> + """ + runCmd('bitbake virtual/kernel -c patch') + kernel_source = get_bb_var('STAGING_KERNEL_DIR') + readme = os.path.join(kernel_source, 'README') + + # This test step adds modified file 'README' to git and creates a + # patch file '0001-KERNEL_DEV_TEST_CASE.patch' at the same location as file + patch_content = 'This is a test to apply a patch to the kernel' + with open(readme, 'a+') as f: + f.write(patch_content) + repo = GitRepo('%s' % kernel_source, is_topdir=True) + repo.run_cmd('add %s' % readme) + repo.run_cmd(['commit', '-m', 'KERNEL_DEV_TEST_CASE']) + repo.run_cmd(['format-patch', '-1']) + patch_name = '0001-KERNEL_DEV_TEST_CASE.patch' + patchpath = os.path.join(kernel_source, patch_name) + runCmd('mv %s %s' % (patchpath, self.recipes_linuxyocto_dir)) + runCmd('rm %s ' % readme) + self.assertFalse(os.path.exists(readme)) + + recipe_append = os.path.join(self.recipeskernel_dir, 'linux-yocto_%.bbappend') + with open(recipe_append, 'w+') as fh: + fh.write('SRC_URI += "file://%s"\n' % patch_name) + fh.write('FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"') + + runCmd('bitbake virtual/kernel -c clean') + runCmd('bitbake virtual/kernel -c patch') + self.assertTrue(os.path.exists(readme)) + result = runCmd('tail -n 1 %s' % readme) + self.assertEqual(result.output, patch_content) diff --git a/poky/meta/lib/oeqa/selftest/cases/meta_ide.py b/poky/meta/lib/oeqa/selftest/cases/meta_ide.py index f47bc7091..03901a2f3 100644 --- a/poky/meta/lib/oeqa/selftest/cases/meta_ide.py +++ b/poky/meta/lib/oeqa/selftest/cases/meta_ide.py @@ -5,9 +5,11 @@ from oeqa.selftest.case import OESelftestTestCase from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject from oeqa.utils.commands import bitbake, get_bb_vars, runCmd +from oeqa.core.decorator import OETestTag import tempfile import shutil +@OETestTag("machine") class MetaIDE(OESelftestTestCase): @classmethod diff --git a/poky/meta/lib/oeqa/selftest/cases/reproducible.py b/poky/meta/lib/oeqa/selftest/cases/reproducible.py index 6dc83d284..eee09d3fb 100644 --- a/poky/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/poky/meta/lib/oeqa/selftest/cases/reproducible.py @@ -8,6 +8,7 @@ from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars import functools import multiprocessing import textwrap +import json import unittest MISSING = 'MISSING' @@ -81,14 +82,12 @@ class ReproducibleTests(OESelftestTestCase): for v in needed_vars: setattr(self, v.lower(), bb_vars[v]) - if not hasattr(self.tc, "extraresults"): - self.tc.extraresults = {} - self.extras = self.tc.extraresults - - self.extras.setdefault('reproducible.rawlogs', {})['log'] = '' + self.extrasresults = {} + self.extrasresults.setdefault('reproducible.rawlogs', {})['log'] = '' + self.extrasresults.setdefault('reproducible', {}).setdefault('files', {}) def append_to_log(self, msg): - self.extras['reproducible.rawlogs']['log'] += msg + self.extrasresults['reproducible.rawlogs']['log'] += msg def compare_packages(self, reference_dir, test_dir, diffutils_sysroot): result = PackageCompareResults() @@ -114,47 +113,70 @@ class ReproducibleTests(OESelftestTestCase): result.sort() return result - @unittest.skip("Reproducible builds do not yet pass") + def write_package_list(self, package_class, name, packages): + self.extrasresults['reproducible']['files'].setdefault(package_class, {})[name] = [ + {'reference': p.reference, 'test': p.test} for p in packages] + def test_reproducible_builds(self): capture_vars = ['DEPLOY_DIR_' + c.upper() for c in self.package_classes] + # Build native utilities + self.write_config('') + bitbake("diffutils-native -c addto_recipe_sysroot") + diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") + + # Reproducible builds should not pull from sstate or mirrors, but + # sharing DL_DIR is fine common_config = textwrap.dedent('''\ INHERIT += "reproducible_build" PACKAGE_CLASSES = "%s" + SSTATE_DIR = "${TMPDIR}/sstate" ''') % (' '.join('package_%s' % c for c in self.package_classes)) - # Do an initial build. It's acceptable for this build to use sstate - self.write_config(common_config) - vars_reference = get_bb_vars(capture_vars) + # Perform a build. + reproducibleA_tmp = os.path.join(self.topdir, 'reproducibleA', 'tmp') + if os.path.exists(reproducibleA_tmp): + bb.utils.remove(reproducibleA_tmp, recurse=True) + + self.write_config((textwrap.dedent('''\ + TMPDIR = "%s" + ''') % reproducibleA_tmp) + common_config) + vars_A = get_bb_vars(capture_vars) bitbake(' '.join(self.images)) - # Build native utilities - bitbake("diffutils-native -c addto_recipe_sysroot") - diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") + # Perform another build. + reproducibleB_tmp = os.path.join(self.topdir, 'reproducibleB', 'tmp') + if os.path.exists(reproducibleB_tmp): + bb.utils.remove(reproducibleB_tmp, recurse=True) - # Perform another build. This build should *not* share sstate or pull - # from any mirrors, but sharing a DL_DIR is fine - self.write_config(textwrap.dedent('''\ - TMPDIR = "${TOPDIR}/reproducible/tmp" - SSTATE_DIR = "${TMPDIR}/sstate" + self.write_config((textwrap.dedent('''\ SSTATE_MIRROR = "" - ''') + common_config) - vars_test = get_bb_vars(capture_vars) + TMPDIR = "%s" + ''') % reproducibleB_tmp) + common_config) + vars_B = get_bb_vars(capture_vars) bitbake(' '.join(self.images)) + # NOTE: The temp directories from the reproducible build are purposely + # kept after the build so it can be diffed for debugging. + for c in self.package_classes: - package_class = 'package_' + c + with self.subTest(package_class=c): + package_class = 'package_' + c + + deploy_A = vars_A['DEPLOY_DIR_' + c.upper()] + deploy_B = vars_B['DEPLOY_DIR_' + c.upper()] - deploy_reference = vars_reference['DEPLOY_DIR_' + c.upper()] - deploy_test = vars_test['DEPLOY_DIR_' + c.upper()] + result = self.compare_packages(deploy_A, deploy_B, diffutils_sysroot) - result = self.compare_packages(deploy_reference, deploy_test, diffutils_sysroot) + self.logger.info('Reproducibility summary for %s: %s' % (c, result)) - self.logger.info('Reproducibility summary for %s: %s' % (c, result)) + self.append_to_log('\n'.join("%s: %s" % (r.status, r.test) for r in result.total)) - self.append_to_log('\n'.join("%s: %s" % (r.status, r.test) for r in result.total)) + self.write_package_list(package_class, 'missing', result.missing) + self.write_package_list(package_class, 'different', result.different) + self.write_package_list(package_class, 'same', result.same) - if result.missing or result.different: - self.fail("The following %s packages are missing or different: %s" % - (c, ' '.join(r.test for r in (result.missing + result.different)))) + if result.missing or result.different: + self.fail("The following %s packages are missing or different: %s" % + (c, ' '.join(r.test for r in (result.missing + result.different)))) diff --git a/poky/meta/lib/oeqa/selftest/cases/runqemu.py b/poky/meta/lib/oeqa/selftest/cases/runqemu.py index b88ae306c..7e676bcb4 100644 --- a/poky/meta/lib/oeqa/selftest/cases/runqemu.py +++ b/poky/meta/lib/oeqa/selftest/cases/runqemu.py @@ -8,6 +8,7 @@ import re import tempfile import time import oe.types +from oeqa.core.decorator import OETestTag from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import bitbake, runqemu, get_bb_var, runCmd @@ -147,6 +148,7 @@ SYSLINUX_TIMEOUT = "10" # dedicated for MACHINE=qemux86-64 where it test that qemux86-64 will # bootup various filesystem types, including live image(iso and hddimg) # where live image was not supported on all qemu architecture. +@OETestTag("machine") class QemuTest(OESelftestTestCase): @classmethod diff --git a/poky/meta/lib/oeqa/selftest/context.py b/poky/meta/lib/oeqa/selftest/context.py index d279994dd..3126ada71 100644 --- a/poky/meta/lib/oeqa/selftest/context.py +++ b/poky/meta/lib/oeqa/selftest/context.py @@ -77,7 +77,14 @@ class OESelftestTestContextExecutor(OETestContextExecutor): parser.add_argument('--machine', required=False, choices=['random', 'all'], help='Run tests on different machines (random/all).') - + + parser.add_argument('-t', '--select-tags', dest="select_tags", + nargs='*', default=None, + help='Filter all (unhidden) tests to any that match any of the specified tags.') + parser.add_argument('-T', '--exclude-tags', dest="exclude_tags", + nargs='*', default=None, + help='Exclude all (unhidden) tests that match any of the specified tags. (exclude applies before select)') + parser.set_defaults(func=self.run) def _get_available_machines(self): @@ -149,6 +156,18 @@ class OESelftestTestContextExecutor(OETestContextExecutor): copyfile(self.tc_kwargs['init']['config_paths']['bblayers'], self.tc_kwargs['init']['config_paths']['bblayers_backup']) + def tag_filter(tags): + if args.exclude_tags: + if any(tag in args.exclude_tags for tag in tags): + return True + if args.select_tags: + if not tags or not any(tag in args.select_tags for tag in tags): + return True + return False + + if args.select_tags or args.exclude_tags: + self.tc_kwargs['load']['tags_filter'] = tag_filter + self.tc_kwargs['run']['skips'] = args.skips self.tc_kwargs['run']['processes'] = args.processes diff --git a/poky/meta/lib/oeqa/utils/commands.py b/poky/meta/lib/oeqa/utils/commands.py index 7140bc73d..dc1e286da 100644 --- a/poky/meta/lib/oeqa/utils/commands.py +++ b/poky/meta/lib/oeqa/utils/commands.py @@ -172,8 +172,11 @@ def runCmd(command, ignore_status=False, timeout=None, assert_error=True, if native_sysroot: extra_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin" % \ (native_sysroot, native_sysroot, native_sysroot) + extra_libpaths = "%s/lib:%s/usr/lib" % \ + (native_sysroot, native_sysroot) nenv = dict(options.get('env', os.environ)) nenv['PATH'] = extra_paths + ':' + nenv.get('PATH', '') + nenv['LD_LIBRARY_PATH'] = extra_libpaths + ':' + nenv.get('LD_LIBRARY_PATH', '') options['env'] = nenv cmd = Command(command, timeout=timeout, output_log=output_log, **options) @@ -337,7 +340,7 @@ def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None, qemu.deploy() try: qemu.start(params=qemuparams, ssh=ssh, runqemuparams=runqemuparams, launch_cmd=launch_cmd, discard_writes=discard_writes) - except EXception as e: + except Exception as e: msg = str(e) + '\nFailed to start QEMU - see the logs in %s' % logdir if os.path.exists(qemu.qemurunnerlog): with open(qemu.qemurunnerlog, 'r') as f: diff --git a/poky/meta/lib/oeqa/utils/network.py b/poky/meta/lib/oeqa/utils/network.py index 59cbbc4f1..59d01723a 100644 --- a/poky/meta/lib/oeqa/utils/network.py +++ b/poky/meta/lib/oeqa/utils/network.py @@ -4,8 +4,8 @@ import socket -def get_free_port(): - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) +def get_free_port(udp = False): + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM if not udp else socket.SOCK_DGRAM) s.bind(('', 0)) addr = s.getsockname() s.close() diff --git a/poky/meta/lib/oeqa/utils/nfs.py b/poky/meta/lib/oeqa/utils/nfs.py new file mode 100644 index 000000000..a37686c91 --- /dev/null +++ b/poky/meta/lib/oeqa/utils/nfs.py @@ -0,0 +1,39 @@ +# SPDX-License-Identifier: MIT +import os +import sys +import tempfile +import contextlib +import socket +from oeqa.utils.commands import bitbake, get_bb_var, Command +from oeqa.utils.network import get_free_port + +@contextlib.contextmanager +def unfs_server(directory, logger = None): + unfs_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "unfs3-native") + if not os.path.exists(os.path.join(unfs_sysroot, "usr", "bin", "unfsd")): + # build native tool + bitbake("unfs3-native -c addto_recipe_sysroot") + + exports = None + cmd = None + try: + # create the exports file + with tempfile.NamedTemporaryFile(delete = False) as exports: + exports.write("{0} (rw,no_root_squash,no_all_squash,insecure)\n".format(directory).encode()) + + # find some ports for the server + nfsport, mountport = get_free_port(udp = True), get_free_port(udp = True) + + nenv = dict(os.environ) + nenv['PATH'] = "{0}/sbin:{0}/usr/sbin:{0}/usr/bin:".format(unfs_sysroot) + nenv.get('PATH', '') + cmd = Command(["unfsd", "-d", "-p", "-N", "-e", exports.name, "-n", str(nfsport), "-m", str(mountport)], + bg = True, env = nenv, output_log = logger) + cmd.run() + yield nfsport, mountport + finally: + if cmd is not None: + cmd.stop() + if exports is not None: + # clean up exports file + os.unlink(exports.name) + diff --git a/poky/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb b/poky/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb index a77653bf5..1c6e46aab 100644 --- a/poky/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb +++ b/poky/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb @@ -20,7 +20,13 @@ FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \ do_install_append () { rm ${D}${sysconfdir} -rf - rm ${D}${base_libdir} -rf + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then + if [ "${nonarch_base_libdir}" != "${base_libdir}" ];then + rm ${D}${nonarch_base_libdir} -rf + fi + else + rm ${D}${base_libdir} -rf + fi rm ${D}${systemd_unitdir} -rf # The ${systemd_unitdir} is /lib/systemd, so we need rmdir /lib, # but not ${base_libdir} here. And the /lib may not exist diff --git a/poky/meta/recipes-connectivity/avahi/files/0001-Fix-opening-etc-resolv.conf-error.patch b/poky/meta/recipes-connectivity/avahi/files/0001-Fix-opening-etc-resolv.conf-error.patch index 11e7e8a9b..cb8b83fd2 100644 --- a/poky/meta/recipes-connectivity/avahi/files/0001-Fix-opening-etc-resolv.conf-error.patch +++ b/poky/meta/recipes-connectivity/avahi/files/0001-Fix-opening-etc-resolv.conf-error.patch @@ -19,6 +19,11 @@ is marked as OE specific. Upstream-Status: Inappropriate [OE Specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + +When connman installed to image, /etc/resolv.conf is link to +/etc/resolv-conf.connman. So launch avahi-daemon after connman too. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- avahi-daemon/avahi-daemon.service.in | 1 + 1 file changed, 1 insertion(+) @@ -31,7 +36,7 @@ index 548c834..63e28e4 100644 [Unit] Description=Avahi mDNS/DNS-SD Stack Requires=avahi-daemon.socket -+After=systemd-resolved.service ++After=systemd-resolved.service connman.service [Service] Type=dbus diff --git a/poky/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb b/poky/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb index 93c406f77..69b117407 100644 --- a/poky/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb +++ b/poky/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb @@ -39,7 +39,7 @@ PACKAGECONFIG[httpstats] = "--with-libxml2=${STAGING_DIR_HOST}${prefix},--withou PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline" PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit" PACKAGECONFIG[urandom] = "--with-randomdev=/dev/urandom,--with-randomdev=/dev/random,," -PACKAGECONFIG[python3] = "--with-python=${PYTHON} --with-python-install-dir=${D}/${PYTHON_SITEPACKAGES_DIR} , --without-python, python3-ply-native," +PACKAGECONFIG[python3] = "--with-python=yes --with-python-install-dir=${PYTHON_SITEPACKAGES_DIR} , --without-python, python3-ply-native," ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}" EXTRA_OECONF = " ${ENABLE_IPV6} --with-libtool --enable-threads \ diff --git a/poky/meta/recipes-connectivity/bluez5/bluez5.inc b/poky/meta/recipes-connectivity/bluez5/bluez5.inc index bffd174c0..6c79ed060 100644 --- a/poky/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/poky/meta/recipes-connectivity/bluez5/bluez5.inc @@ -57,6 +57,7 @@ SRC_URI = "\ file://0001-Makefile.am-Fix-a-race-issue-for-tools.patch \ file://CVE-2018-10910.patch \ file://gcc9-fixes.patch \ + file://0001-tools-Fix-build-after-y2038-changes-in-glibc.patch \ " S = "${WORKDIR}/bluez-${PV}" diff --git a/poky/meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch b/poky/meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch new file mode 100644 index 000000000..9ca20ae53 --- /dev/null +++ b/poky/meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch @@ -0,0 +1,68 @@ +From f36f71f60b1e68c0f12e615b9b128d089ec3dd19 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Fri, 7 Jun 2019 09:51:33 +0200 +Subject: [PATCH] tools: Fix build after y2038 changes in glibc + +The 32-bit SIOCGSTAMP has been deprecated. Use the deprecated name +to fix the build. + +Upstream-Status: backport commit f36f71f60b1e68c0f12e615b9b128d089ec3dd19 + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> + +--- + tools/l2test.c | 6 +++++- + tools/rctest.c | 6 +++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/tools/l2test.c b/tools/l2test.c +index e755ac881..e787c2ce2 100644 +--- a/tools/l2test.c ++++ b/tools/l2test.c +@@ -55,6 +55,10 @@ + #define BREDR_DEFAULT_PSM 0x1011 + #define LE_DEFAULT_PSM 0x0080 + ++#ifndef SIOCGSTAMP_OLD ++#define SIOCGSTAMP_OLD SIOCGSTAMP ++#endif ++ + /* Test modes */ + enum { + SEND, +@@ -907,7 +911,7 @@ static void recv_mode(int sk) + if (timestamp) { + struct timeval tv; + +- if (ioctl(sk, SIOCGSTAMP, &tv) < 0) { ++ if (ioctl(sk, SIOCGSTAMP_OLD, &tv) < 0) { + timestamp = 0; + memset(ts, 0, sizeof(ts)); + } else { +diff --git a/tools/rctest.c b/tools/rctest.c +index 94490f462..bc8ed875d 100644 +--- a/tools/rctest.c ++++ b/tools/rctest.c +@@ -50,6 +50,10 @@ + + #include "src/shared/util.h" + ++#ifndef SIOCGSTAMP_OLD ++#define SIOCGSTAMP_OLD SIOCGSTAMP ++#endif ++ + /* Test modes */ + enum { + SEND, +@@ -505,7 +509,7 @@ static void recv_mode(int sk) + if (timestamp) { + struct timeval tv; + +- if (ioctl(sk, SIOCGSTAMP, &tv) < 0) { ++ if (ioctl(sk, SIOCGSTAMP_OLD, &tv) < 0) { + timestamp = 0; + memset(ts, 0, sizeof(ts)); + } else { +-- +2.19.1 + diff --git a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Do-not-pass-null-pointer-to-freeaddrinfo.patch b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Do-not-pass-null-pointer-to-freeaddrinfo.patch deleted file mode 100644 index a44d1bf2f..000000000 --- a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Do-not-pass-null-pointer-to-freeaddrinfo.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4f115fc314646500f7b4178d7248a02654c7cd10 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 30 Nov 2018 16:47:57 -0800 -Subject: [PATCH] Do not pass null pointer to freeaddrinfo() - -Passing null pointer as input parameter to freeaddrinfo() is undefined -behaviour, some libcs e.g. glibc might just call free() which does -accept null pointer but other libcs e.g. musl might not and instead -cause the program to segfault. Therefore do not rely on undefined -behaviour instead make it deterministic - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - support/export/client.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -Index: nfs-utils-2.3.2/support/export/client.c -=================================================================== ---- nfs-utils-2.3.2.orig/support/export/client.c -+++ nfs-utils-2.3.2/support/export/client.c -@@ -309,7 +309,8 @@ client_lookup(char *hname, int canonical - init_addrlist(clp, ai); - - out: -- freeaddrinfo(ai); -+ if (ai) -+ freeaddrinfo(ai); - return clp; - } - diff --git a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch index aa551ebd1..fcb0e99b3 100644 --- a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch +++ b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch @@ -22,25 +22,28 @@ so rename ../support/misc/file.c to ../support/misc/misc.c. Upstream-Status: Submitted[https://marc.info/?l=linux-nfs&m=154502780423058&w=2] Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> + +Rebase it. + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- support/misc/Makefile.am | 2 +- - support/misc/file.c | 111 ----------------------------------------------- - support/misc/misc.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++ + support/misc/file.c | 111 --------------------------------------------------------------------------------------------------------------- + support/misc/misc.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ support/nsm/Makefile.am | 2 +- 4 files changed, 113 insertions(+), 113 deletions(-) - delete mode 100644 support/misc/file.c - create mode 100644 support/misc/misc.c diff --git a/support/misc/Makefile.am b/support/misc/Makefile.am -index 8936b0d..d4c1f76 100644 +index f9993e3..8b0e9db 100644 --- a/support/misc/Makefile.am +++ b/support/misc/Makefile.am -@@ -1,6 +1,6 @@ +@@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in noinst_LIBRARIES = libmisc.a --libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c file.c -+libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c misc.c +-libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c file.c \ ++libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c misc.c \ + nfsd_path.c workqueue.c xstat.c MAINTAINERCLEANFILES = Makefile.in diff --git a/support/misc/file.c b/support/misc/file.c @@ -290,6 +293,3 @@ index 8f5874e..68f1a46 100644 BUILT_SOURCES = $(GENFILES) --- -2.7.4 - diff --git a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-update-the-path-of-libnfs.a.patch b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-update-the-path-of-libnfs.a.patch deleted file mode 100644 index 906ac0f90..000000000 --- a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-update-the-path-of-libnfs.a.patch +++ /dev/null @@ -1,50 +0,0 @@ -From fcece65d1b713eaeef41706898440302f8ce92d9 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <Mingli.Yu@windriver.com> -Date: Thu, 12 Jul 2018 15:19:41 +0800 -Subject: [PATCH] Makefile.am: update the path of libnfs.a - -The libnfs.a is under ../support/nfs/.libs/ now, -update the reference path accordingly to fix below -build error when run "make -C tests statdb_dump": -| make: *** No rule to make target '../support/nfs/libnfs.a', needed by 'statdb_dump'. Stop. - -And below error when run "make -C tests/nsm_client nsm_client" -| make: *** No rule to make target '../../support/nfs/libnfs.a', needed by 'nsm_client'. Stop. - -Upstream-Status: Submitted[https://marc.info/?l=linux-nfs&m=154502636522745&w=2] - -Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> ---- - tests/Makefile.am | 2 +- - tests/nsm_client/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 1f96264..74aa629 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -3,7 +3,7 @@ - check_PROGRAMS = statdb_dump - statdb_dump_SOURCES = statdb_dump.c - --statdb_dump_LDADD = ../support/nfs/libnfs.a \ -+statdb_dump_LDADD = ../support/nfs/.libs/libnfs.a \ - ../support/nsm/libnsm.a $(LIBCAP) - - SUBDIRS = nsm_client -diff --git a/tests/nsm_client/Makefile.am b/tests/nsm_client/Makefile.am -index a8fc131..43db9c2 100644 ---- a/tests/nsm_client/Makefile.am -+++ b/tests/nsm_client/Makefile.am -@@ -13,7 +13,7 @@ check_PROGRAMS = nsm_client - nsm_client_SOURCES = $(GENFILES) nsm_client.c - - BUILT_SOURCES = $(GENFILES) --nsm_client_LDADD = ../../support/nfs/libnfs.a \ -+nsm_client_LDADD = ../../support/nfs/.libs/libnfs.a \ - ../../support/nsm/libnsm.a $(LIBCAP) $(LIBTIRPC) - - if CONFIG_RPCGEN --- -2.7.4 - diff --git a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch index 17aabb9e4..d14f0789f 100644 --- a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch +++ b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch @@ -26,18 +26,15 @@ Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index e82ff14..d0cc5d5 100644 +index 50002b4..aebff01 100644 --- a/configure.ac +++ b/configure.ac -@@ -548,7 +548,7 @@ my_am_cflags="\ +@@ -582,7 +582,7 @@ my_am_cflags="\ -Wall \ -Wextra \ - -Werror=strict-prototypes \ + $rpcgen_cflags \ - -Werror=missing-prototypes \ + -Wmissing-prototypes \ -Werror=missing-declarations \ -Werror=format=2 \ -Werror=undef \ --- -2.7.4 - diff --git a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch index 822939f0d..f13d7b380 100644 --- a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch +++ b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch @@ -12,20 +12,28 @@ instead but forgot to update the mount.nfs helper 'start-statd' accordingly. Upstream-Status: Inappropriate [other] Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> + +Rebase it. + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- - utils/statd/start-statd | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + utils/statd/start-statd | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -Index: nfs-utils-2.1.1/utils/statd/start-statd -=================================================================== ---- nfs-utils-2.1.1.orig/utils/statd/start-statd -+++ nfs-utils-2.1.1/utils/statd/start-statd -@@ -28,7 +28,7 @@ fi +diff --git a/utils/statd/start-statd b/utils/statd/start-statd +index af5c950..df9b9be 100755 +--- a/utils/statd/start-statd ++++ b/utils/statd/start-statd +@@ -28,10 +28,10 @@ fi # First try systemd if it's installed. if [ -d /run/systemd/system ]; then # Quit only if the call worked. -- systemctl start rpc-statd.service && exit -+ systemctl start nfs-statd.service && exit +- if systemctl start rpc-statd.service; then ++ if systemctl start nfs-statd.service; then + # Ensure systemd knows not to stop rpc.statd or its dependencies + # on 'systemctl isolate ..' +- systemctl add-wants --runtime remote-fs.target rpc-statd.service ++ systemctl add-wants --runtime remote-fs.target nfs-statd.service + exit 0 + fi fi - - cd / diff --git a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch deleted file mode 100644 index 25ca41515..000000000 --- a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch +++ /dev/null @@ -1,133 +0,0 @@ -Fixed: -| file.c: In function 'generic_make_pathname': -| file.c:48:13: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'RAND_MAX'? -| if (size > PATH_MAX) -| ^~~~~~~~ -[snip] - -Upstream-Status: Pending [https://git.alpinelinux.org/cgit/aports/tree/main/nfs-utils/limits.patch?id=f6734a77d3caee73325f8cc1f77d1b5117a75096] - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - support/export/export.c | 1 + - support/export/xtab.c | 1 + - support/misc/file.c | 1 + - support/nfs/xcommon.c | 1 + - support/nsm/file.c | 1 + - utils/blkmapd/device-discovery.c | 1 + - utils/gssd/krb5_util.c | 1 + - utils/mountd/cache.c | 1 + - utils/mountd/mountd.c | 1 + - utils/mountd/rmtab.c | 1 + - 10 files changed, 10 insertions(+) - -diff --git a/support/export/export.c b/support/export/export.c ---- a/support/export/export.c -+++ b/support/export/export.c -@@ -17,6 +17,7 @@ - #include <stdlib.h> - #include <dirent.h> - #include <errno.h> -+#include <limits.h> - #include "xmalloc.h" - #include "nfslib.h" - #include "exportfs.h" -diff --git a/support/export/xtab.c b/support/export/xtab.c ---- a/support/export/xtab.c -+++ b/support/export/xtab.c -@@ -18,6 +18,7 @@ - #include <sys/stat.h> - #include <errno.h> - #include <libgen.h> -+#include <limits.h> - - #include "nfslib.h" - #include "exportfs.h" -diff --git a/support/misc/file.c b/support/misc/file.c ---- a/support/misc/file.c -+++ b/support/misc/file.c -@@ -27,6 +27,7 @@ - #include <dirent.h> - #include <stdlib.h> - #include <stdbool.h> -+#include <limits.h> - - #include "xlog.h" - #include "misc.h" -diff --git a/support/nfs/xcommon.c b/support/nfs/xcommon.c ---- a/support/nfs/xcommon.c -+++ b/support/nfs/xcommon.c -@@ -16,6 +16,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#include <limits.h> - - #include "xcommon.h" - #include "nls.h" /* _() */ -diff --git a/support/nsm/file.c b/support/nsm/file.c ---- a/support/nsm/file.c -+++ b/support/nsm/file.c -@@ -85,6 +85,7 @@ - #include <fcntl.h> - #include <dirent.h> - #include <grp.h> -+#include <limits.h> - - #include "xlog.h" - #include "nsm.h" -diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c ---- a/utils/blkmapd/device-discovery.c -+++ b/utils/blkmapd/device-discovery.c -@@ -49,6 +49,7 @@ - #include <unistd.h> - #include <libgen.h> - #include <errno.h> -+#include <limits.h> - #include <libdevmapper.h> - - #ifdef HAVE_CONFIG_H -diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c ---- a/utils/gssd/krb5_util.c -+++ b/utils/gssd/krb5_util.c -@@ -120,6 +120,7 @@ - #endif - #include <krb5.h> - #include <rpc/auth_gss.h> -+#include <limits.h> - - #include "gssd.h" - #include "err_util.h" -diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c ---- a/utils/mountd/cache.c -+++ b/utils/mountd/cache.c -@@ -26,6 +26,7 @@ - #include <pwd.h> - #include <grp.h> - #include <mntent.h> -+#include <limits.h> - #include "misc.h" - #include "nfslib.h" - #include "exportfs.h" -diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c ---- a/utils/mountd/mountd.c -+++ b/utils/mountd/mountd.c -@@ -22,6 +22,7 @@ - #include <fcntl.h> - #include <sys/resource.h> - #include <sys/wait.h> -+#include <limits.h> - - #include "conffile.h" - #include "xmalloc.h" -diff --git a/utils/mountd/rmtab.c b/utils/mountd/rmtab.c ---- a/utils/mountd/rmtab.c -+++ b/utils/mountd/rmtab.c -@@ -16,6 +16,7 @@ - #include <netinet/in.h> - #include <arpa/inet.h> - #include <netdb.h> -+#include <limits.h> - - #include "misc.h" - #include "exportfs.h" diff --git a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch index 22002fadc..921f5edc8 100644 --- a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch +++ b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch @@ -11,30 +11,19 @@ Upstream-Status: Pending [https://github.com/alpinelinux/aports/blob/master/main Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- - configure.ac | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) + configure.ac | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index 276dec3..760238b 100644 +index 50002b4..dcadb23 100644 --- a/configure.ac +++ b/configure.ac -@@ -408,7 +408,7 @@ if test "$enable_gss" = yes; then - fi - - dnl libdnsidmap specific checks --AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed)) -+AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed)) - - AC_ARG_ENABLE([ldap], - [AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])]) -@@ -547,11 +547,11 @@ my_am_cflags="\ - -pipe \ +@@ -582,10 +582,10 @@ my_am_cflags="\ -Wall \ -Wextra \ -- -Werror=strict-prototypes \ + $rpcgen_cflags \ - -Werror=missing-prototypes \ - -Werror=missing-declarations \ -+ -Wstrict-prototypes \ + -Wmissing-prototypes \ + -Wmissing-declarations \ -Werror=format=2 \ @@ -43,7 +32,7 @@ index 276dec3..760238b 100644 -Werror=missing-include-dirs \ -Werror=strict-aliasing=2 \ -Werror=init-self \ -@@ -579,10 +579,9 @@ AC_DEFUN([CHECK_CCSUPPORT], [ +@@ -614,10 +614,9 @@ AC_DEFUN([CHECK_CCSUPPORT], [ CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1]) CHECK_CCSUPPORT([-Werror=int-conversion], [flg2]) diff --git a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.3.bb b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.1.bb index 28f98980d..8b673c8f5 100644 --- a/poky/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.3.bb +++ b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.1.bb @@ -28,19 +28,16 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://proc-fs-nfsd.mount \ file://nfs-utils-debianize-start-statd.patch \ file://bugfix-adjust-statd-service-name.patch \ - file://nfs-utils-musl-limits.patch \ file://0001-cacheio-use-intmax_t-for-formatted-IO.patch \ - file://0001-Do-not-pass-null-pointer-to-freeaddrinfo.patch \ file://clang-format-string.patch \ - file://0001-Makefile.am-update-the-path-of-libnfs.a.patch \ file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ file://0001-Don-t-build-tools-with-CC_FOR_BUILD.patch \ " SRC_URI_append_libc-glibc = " file://0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch" SRC_URI_append_libc-musl = " file://nfs-utils-musl-res_querydomain.patch" -SRC_URI[md5sum] = "b6c9c032995af1c08fea9fbcc1ce33e9" -SRC_URI[sha256sum] = "f68b34793831b05f1fd5760d6bdec92772c7684177586a99a61e7b444f336322" +SRC_URI[md5sum] = "161efe469ec1b06f1c750bd87f8ba6dd" +SRC_URI[sha256sum] = "85274ada94479b1beba9f8eeffd19f477c53a6710b9998d1192c807854087736" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies. @@ -108,9 +105,6 @@ FILES_${PN} += "${systemd_unitdir}" do_configure_prepend() { sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \ ${S}/utils/mount/Makefile.am - - sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \ - ${S}/utils/osd_login/Makefile.am } # Make clean needed because the package comes with diff --git a/poky/meta/recipes-core/base-files/base-files_3.0.14.bb b/poky/meta/recipes-core/base-files/base-files_3.0.14.bb index 4b4027f18..2b1f217dd 100644 --- a/poky/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/poky/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -129,7 +129,6 @@ do_install () { install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc - install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd @@ -142,6 +141,10 @@ do_install () { fi } +do_install_append_libc-glibc () { + install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf +} + DISTRO_VERSION[vardepsexclude] += "DATE" do_install_basefilesissue () { install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir} diff --git a/poky/meta/recipes-core/dropbear/dropbear.inc b/poky/meta/recipes-core/dropbear/dropbear.inc index dcbda741c..7269888a4 100644 --- a/poky/meta/recipes-core/dropbear/dropbear.inc +++ b/poky/meta/recipes-core/dropbear/dropbear.inc @@ -70,8 +70,13 @@ do_install() { install -m 0644 ${WORKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear install -m 0755 dropbearmulti ${D}${sbindir}/ - ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient + for i in ${BINCOMMANDS} + do + # ssh and scp symlinks are created by update-alternatives + if [ $i = ssh ] || [ $i = scp ]; then continue; fi + ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i + done for i in ${SBINCOMMANDS} do ln -s ./dropbearmulti ${D}${sbindir}/$i @@ -101,7 +106,7 @@ do_install() { inherit update-alternatives ALTERNATIVE_PRIORITY = "20" -ALTERNATIVE_${PN} = "scp ssh" +ALTERNATIVE_${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp ssh', d)}" ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti" @@ -113,3 +118,5 @@ pkg_postrm_append_${PN} () { rm ${sysconfdir}/dropbear/dropbear_dss_host_key fi } + +FILES_${PN} += "${bindir}" diff --git a/poky/meta/recipes-core/ell/ell_0.21.bb b/poky/meta/recipes-core/ell/ell_0.22.bb index 487fbccab..b3942fc30 100644 --- a/poky/meta/recipes-core/ell/ell_0.21.bb +++ b/poky/meta/recipes-core/ell/ell_0.22.bb @@ -14,8 +14,8 @@ DEPENDS = "dbus" inherit autotools pkgconfig SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "f94f8c812b0426b0c30b651fa5142dd9" -SRC_URI[sha256sum] = "a0db4e3057ba41035637354b6af2aa4c74f83509e0c3e563d682df9d72eaff17" +SRC_URI[md5sum] = "a4e7d74404f11e71775b89f53a8f1c33" +SRC_URI[sha256sum] = "3c1d6d997e17dfcbe4ebcd1331d9a7be5c64f2f0a0813bc223790e570d8da2e3" do_configure_prepend () { mkdir -p ${S}/build-aux diff --git a/poky/meta/recipes-core/glib-networking/glib-networking_2.60.2.bb b/poky/meta/recipes-core/glib-networking/glib-networking_2.60.3.bb index 4d4fe6491..d893b7a3a 100644 --- a/poky/meta/recipes-core/glib-networking/glib-networking_2.60.2.bb +++ b/poky/meta/recipes-core/glib-networking/glib-networking_2.60.3.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" DEPENDS = "glib-2.0" -SRC_URI[archive.md5sum] = "bf46d1208ac00d78a45fbf621d459025" -SRC_URI[archive.sha256sum] = "c022f3d10f55a5b7c31676fb001b4cb6401db8ab9f6e8418c69de00d0f268732" +SRC_URI[archive.md5sum] = "e8fd0462a82269fb4bbd6c07a1e7d0f4" +SRC_URI[archive.sha256sum] = "d50183046a4ff955d8cc7e953067cdfc94f14dbfda3024bf377ff37a3121dcd5" PACKAGECONFIG ??= "gnutls" diff --git a/poky/meta/recipes-core/glibc/glibc-package.inc b/poky/meta/recipes-core/glibc/glibc-package.inc index f796876a8..9b1e7b790 100644 --- a/poky/meta/recipes-core/glibc/glibc-package.inc +++ b/poky/meta/recipes-core/glibc/glibc-package.inc @@ -88,14 +88,7 @@ do_install_append () { rm -f ${D}${sysconfdir}/ld.so.conf rm -f ${D}${base_sbindir}/ldconfig # This directory will be empty now so remove it too. - # But check whether it exists first, since it won't for glibc-initial. - if [ -d ${D}${sysconfdir} ]; then - rmdir ${D}${sysconfdir} - fi - fi - - if echo ${PN}|grep -q "glibc-initial"; then - return + rmdir ${D}${sysconfdir} fi install -d ${D}${sysconfdir}/init.d diff --git a/poky/meta/recipes-core/glibc/glibc-testsuite_2.30.bb b/poky/meta/recipes-core/glibc/glibc-testsuite_2.30.bb new file mode 100644 index 000000000..64fa8d87d --- /dev/null +++ b/poky/meta/recipes-core/glibc/glibc-testsuite_2.30.bb @@ -0,0 +1,53 @@ +require glibc_${PV}.bb + +# handle PN differences +FILESEXTRAPATHS_prepend := "${THISDIR}/glibc:" + +# strip provides +PROVIDES = "" +# setup depends +INHIBIT_DEFAULT_DEPS = "" + +DEPENDS += "glibc-locale libgcc gcc-runtime" + +# remove the initial depends +DEPENDS_remove = "libgcc-initial" + +inherit qemu + +SRC_URI += "file://check-test-wrapper" + +DEPENDS += "${@'qemu-native' if d.getVar('TOOLCHAIN_TEST_TARGET') == 'user' else ''}" + +TOOLCHAIN_TEST_TARGET ??= "user" +TOOLCHAIN_TEST_HOST ??= "localhost" +TOOLCHAIN_TEST_HOST_USER ??= "root" +TOOLCHAIN_TEST_HOST_PORT ??= "2222" + +do_check[dirs] += "${B}" +do_check[nostamp] = "1" +do_check () { + chmod 0755 ${WORKDIR}/check-test-wrapper + + # clean out previous test results + oe_runmake tests-clean + # makefiles don't clean entirely (and also sometimes fails due to too many args) + find ${B} -type f -name "*.out" -delete + find ${B} -type f -name "*.test-result" -delete + find ${B}/catgets -name "*.cat" -delete + find ${B}/conform -name "symlist-*" -delete + [ ! -e ${B}/timezone/testdata ] || rm -rf ${B}/timezone/testdata + + oe_runmake -i \ + QEMU_SYSROOT="${RECIPE_SYSROOT}" \ + QEMU_OPTIONS="${@qemu_target_binary(d)} ${QEMU_OPTIONS}" \ + SSH_HOST="${TOOLCHAIN_TEST_HOST}" \ + SSH_HOST_USER="${TOOLCHAIN_TEST_HOST_USER}" \ + SSH_HOST_PORT="${TOOLCHAIN_TEST_HOST_PORT}" \ + test-wrapper="${WORKDIR}/check-test-wrapper ${TOOLCHAIN_TEST_TARGET}" \ + check +} +addtask do_check after do_compile + +inherit nopackages +deltask do_stash_locale diff --git a/poky/meta/recipes-core/glibc/glibc/check-test-wrapper b/poky/meta/recipes-core/glibc/glibc/check-test-wrapper new file mode 100644 index 000000000..f8e04e02d --- /dev/null +++ b/poky/meta/recipes-core/glibc/glibc/check-test-wrapper @@ -0,0 +1,71 @@ +#!/usr/bin/env python3 +import sys +import os +import subprocess + +env = os.environ.copy() +args = sys.argv[1:] +targettype = args.pop(0) + +if targettype == "user": + qemuargs = os.environ.get("QEMU_OPTIONS", "").split() + if not os.path.exists(qemuargs[0]): + # ensure qemu args has a valid absolute path + for i in os.environ.get("PATH", "").split(":"): + if os.path.exists(os.path.join(i, qemuargs[0])): + qemuargs[0] = os.path.join(i, qemuargs[0]) + break + sysroot = os.environ.get("QEMU_SYSROOT", None) + if not sysroot: + sys.exit(-1) + libpaths = [sysroot + "/usr/lib", sysroot + "/lib"] + + if args[0] == "env": + args.pop(0) + if len(args) == 0: + args = ["env"] + else: + # process options + while args[0].startswith("-"): + opt = args.pop(0).lstrip("-") + if "i" in opt: + env.clear() + # process environment vars + while "=" in args[0]: + key, val = args.pop(0).split("=", 1) + if key == "LD_LIBRARY_PATH": + libpaths += val.split(":") + else: + env[key] = val + if args[0] == "cp": + # ignore copies, the filesystem is the same + sys.exit(0) + + qemuargs += ["-L", sysroot] + qemuargs += ["-E", "LD_LIBRARY_PATH={}".format(":".join(libpaths))] + command = qemuargs + args +elif targettype == "ssh": + host = os.environ.get("SSH_HOST", None) + user = os.environ.get("SSH_HOST_USER", None) + port = os.environ.get("SSH_HOST_PORT", None) + + command = ["ssh", "-o", "UserKnownHostsFile=/dev/null", "-o", "StrictHostKeyChecking=no"] + if port: + command += ["-p", str(port)] + if not host: + sys.exit(-1) + command += ["{}@{}".format(user, host) if user else host] + + # wrap and replace quotes for correct transformation on ssh + wrapped = " ".join(["'{0}'".format(i.replace("'", r"'\''")) for i in ["cd", os.getcwd()]]) + "; " + wrapped += " ".join(["'{0}'".format(i.replace("'", r"'\''")) for i in args]) + command += ["sh", "-c", "\"{}\"".format(wrapped)] +else: + sys.exit(-1) + +try: + r = subprocess.run(command, timeout = 1800, env = env) + sys.exit(r.returncode) +except subprocess.TimeoutExpired: + sys.exit(-1) + 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 e9cac98c5..3f1b1c7a5 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 @@ -11,6 +11,8 @@ IMAGE_INSTALL = "packagegroup-core-boot packagegroup-core-ssh-openssh packagegro IMAGE_FEATURES += "x11-base package-management splash" +QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' + # Ensure there's enough space to do a core-image-sato build, with rm_work enabled IMAGE_ROOTFS_EXTRA_SPACE = "41943040" diff --git a/poky/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh index 6f965a687..1c525b71b 100755 --- a/poky/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh +++ b/poky/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh @@ -80,7 +80,7 @@ mk_dir() { link_file() { EXEC=" if [ -L \"$2\" ]; then - [ \"\$(readlink -f \"$2\")\" != \"$1\" ] && { rm -f \"$2\"; ln -sf \"$1\" \"$2\"; }; + [ \"\$(readlink \"$2\")\" != \"$1\" ] && { rm -f \"$2\"; ln -sf \"$1\" \"$2\"; }; elif [ -d \"$2\" ]; then if awk '\$2 == \"$2\" {exit 1}' /proc/mounts; then cp -a $2/* $1 2>/dev/null; diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.6.bb b/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.8.bb index ebc4648a1..ebc4648a1 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.6.bb +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.8.bb diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.6.bb b/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.8.bb index 893f5e737..1787f6921 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.6.bb +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.8.bb @@ -3,16 +3,14 @@ DESCRIPTION = "Forked code from glibc libary to extract only crypto part." HOMEPAGE = "https://github.com/besser82/libxcrypt" SECTION = "libs" LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM ?= "file://LICENSING;md5=be275bc7f91642efe7709a8ae7a1433b \ +LIC_FILES_CHKSUM ?= "file://LICENSING;md5=3bb6614cf5880cbf1b9dbd9e3d145e2c \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ " inherit autotools pkgconfig -PV = "4.4.6" - SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "398943774c5ff38baf1bc5ee088855fd8983bb05" +SRCREV = "acd84997a5a8b2badd28b70a642abee11272fad2" SRCBRANCH ?= "develop" PROVIDES = "virtual/crypt" @@ -26,8 +24,8 @@ FILES_${PN} = "${libdir}/libcrypt*.so.* \ S = "${WORKDIR}/git" BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" -TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir} -Wno-error=missing-attributes" -CPPFLAGS_append_class-nativesdk = " -Wno-error=missing-attributes" +TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir} -Wno-error" +CPPFLAGS_append_class-nativesdk = " -Wno-error" API = "--disable-obsolete-api" EXTRA_OECONF += "${API}" diff --git a/poky/meta/recipes-core/musl/musl_git.bb b/poky/meta/recipes-core/musl/musl_git.bb index 64aee6c44..9341bf5d5 100644 --- a/poky/meta/recipes-core/musl/musl_git.bb +++ b/poky/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "29e8737f81ccc9fbadcf61a75318aa3d0516aafa" +SRCREV = "6ad514e4e278f0c3b18eb2db1d45638c9af1c07f" BASEVER = "1.1.23" diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index 3a2f50feb..abbee14bd 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb @@ -10,12 +10,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -# -# Set by the machine configuration with packages essential for device bootup -# -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" - # Distro can override the following VIRTUAL-RUNTIME providers: VIRTUAL-RUNTIME_dev_manager ?= "udev" VIRTUAL-RUNTIME_keymaps ?= "keymaps" diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index f206cee37..9b0ae0d1c 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -37,7 +37,7 @@ RDEPENDS_packagegroup-self-hosted-host-tools = "\ e2fsprogs-tune2fs \ hdparm \ iptables \ - lsb \ + lsb-release \ mc \ mc-fish \ mc-helpers \ diff --git a/poky/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service b/poky/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service index e8b027e97..15af16a9f 100644 --- a/poky/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service +++ b/poky/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service @@ -9,7 +9,8 @@ Description=Serial Getty on %I Documentation=man:agetty(8) man:systemd-getty-generator(8) Documentation=http://0pointer.de/blog/projects/serial-console.html -BindsTo=dev-%i.device +PartOf=dev-%i.device +ConditionPathExists=/dev/%i After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service After=rc-local.service diff --git a/poky/meta/recipes-core/systemd/systemd.inc b/poky/meta/recipes-core/systemd/systemd.inc index 3a353b009..191271561 100644 --- a/poky/meta/recipes-core/systemd/systemd.inc +++ b/poky/meta/recipes-core/systemd/systemd.inc @@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "db2e367bfc3b119609f837eb973d915f6c550b2f" +SRCREV = "f875dced33462641e1fb7875d2f9a8cd8e8c2fcc" SRCBRANCH = "v242-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" diff --git a/poky/meta/recipes-core/systemd/systemd/0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch b/poky/meta/recipes-core/systemd/systemd/0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch deleted file mode 100644 index ff64f58c9..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6e2f78948403a4cce45b9e34311c9577c624f066 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering <lennart@poettering.net> -Date: Mon, 17 Jun 2019 10:51:25 +0200 -Subject: [PATCH] core: set fs.file-max sysctl to LONG_MAX rather than - ULONG_MAX - -Since kernel 5.2 the kernel thankfully returns proper errors when we -write a value out of range to the sysctl. Which however breaks writing -ULONG_MAX to request the maximum value. Hence let's write the new -maximum value instead, LONG_MAX. - -/cc @brauner - -Fixes: #12803 - -Upstream-Status: Backport - -Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com> ---- - src/core/main.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/core/main.c b/src/core/main.c -index b33ea1b5b5..e7f51815f0 100644 ---- a/src/core/main.c -+++ b/src/core/main.c -@@ -1245,9 +1245,9 @@ static void bump_file_max_and_nr_open(void) { - #endif - - #if BUMP_PROC_SYS_FS_FILE_MAX -- /* I so wanted to use STRINGIFY(ULONG_MAX) here, but alas we can't as glibc/gcc define that as -- * "(0x7fffffffffffffffL * 2UL + 1UL)". Seriously. 😢 */ -- if (asprintf(&t, "%lu\n", ULONG_MAX) < 0) { -+ /* The maximum the kernel allows for this since 5.2 is LONG_MAX, use that. (Previously thing where -+ * different but the operation would fail silently.) */ -+ if (asprintf(&t, "%li\n", LONG_MAX) < 0) { - log_oom(); - return; - } diff --git a/poky/meta/recipes-core/systemd/systemd/0001-networkd-fix-link-up.patch b/poky/meta/recipes-core/systemd/systemd/0001-networkd-fix-link-up.patch deleted file mode 100644 index 4c7a0a33a..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0001-networkd-fix-link-up.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 6bd76d2d4ff130decd3aa13e0c2dbfd56ff8d7b7 Mon Sep 17 00:00:00 2001 -From: Susant Sahani <ssahani@gmail.com> -Date: Thu, 9 May 2019 07:35:35 +0530 -Subject: [PATCH] networkd: fix link_up() (#12505) - -Fillup IFLA_INET6_ADDR_GEN_MODE while we do link_up. - -Fixes the following error: -``` -dummy-test: Could not bring up interface: Invalid argument -``` - -After reading the kernel code when we do a link up -``` -net/core/rtnetlink.c -IFLA_AF_SPEC - af_ops->set_link_af(dev, af); - inet6_set_link_af - if (tb[IFLA_INET6_ADDR_GEN_MODE]) - Here it looks for IFLA_INET6_ADDR_GEN_MODE -``` -Since link up we didn't filling up that it's failing. - -Closes #12504. - -Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com> - -Upstream-Status: Backport [https://github.com/systemd/systemd/commit/4eb086a38712ea98faf41e075b84555b11b54362.patch] - ---- - src/network/networkd-link.c | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c -index e466b96792..042496173c 100644 ---- a/src/network/networkd-link.c -+++ b/src/network/networkd-link.c -@@ -2034,6 +2034,8 @@ static int link_up(Link *link) { - } - - if (link_ipv6_enabled(link)) { -+ uint8_t ipv6ll_mode; -+ - r = sd_netlink_message_open_container(req, IFLA_AF_SPEC); - if (r < 0) - return log_link_error_errno(link, r, "Could not open IFLA_AF_SPEC container: %m"); -@@ -2049,6 +2051,19 @@ static int link_up(Link *link) { - return log_link_error_errno(link, r, "Could not append IFLA_INET6_TOKEN: %m"); - } - -+ if (!link_ipv6ll_enabled(link)) -+ ipv6ll_mode = IN6_ADDR_GEN_MODE_NONE; -+ else if (sysctl_read_ip_property(AF_INET6, link->ifname, "stable_secret", NULL) < 0) -+ /* The file may not exist. And event if it exists, when stable_secret is unset, -+ * reading the file fails with EIO. */ -+ ipv6ll_mode = IN6_ADDR_GEN_MODE_EUI64; -+ else -+ ipv6ll_mode = IN6_ADDR_GEN_MODE_STABLE_PRIVACY; -+ -+ r = sd_netlink_message_append_u8(req, IFLA_INET6_ADDR_GEN_MODE, ipv6ll_mode); -+ if (r < 0) -+ return log_link_error_errno(link, r, "Could not append IFLA_INET6_ADDR_GEN_MODE: %m"); -+ - r = sd_netlink_message_close_container(req); - if (r < 0) - return log_link_error_errno(link, r, "Could not close AF_INET6 container: %m"); diff --git a/poky/meta/recipes-core/systemd/systemd/0001-resolved-Fix-incorrect-use-of-OpenSSL-BUF_MEM.patch b/poky/meta/recipes-core/systemd/systemd/0001-resolved-Fix-incorrect-use-of-OpenSSL-BUF_MEM.patch deleted file mode 100644 index f0ae1db60..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0001-resolved-Fix-incorrect-use-of-OpenSSL-BUF_MEM.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 18bddeaaf225d5becfc10cd2c6a1d037c90574a2 Mon Sep 17 00:00:00 2001 -From: Tomas Mraz <tmraz@fedoraproject.org> -Date: Tue, 11 Jun 2019 15:10:21 +0200 -Subject: [PATCH] resolved: Fix incorrect use of OpenSSL BUF_MEM - -Fixes: #12763 -Upstream-Status: Backport [Not yet released] - https://github.com/systemd/systemd/commit/18bddeaaf225d5becfc10cd2c6a1d037c90574a2 -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> ---- - src/resolve/resolved-dnstls-openssl.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/resolve/resolved-dnstls-openssl.c b/src/resolve/resolved-dnstls-openssl.c -index f269e4d6487f..5d9223007581 100644 ---- a/src/resolve/resolved-dnstls-openssl.c -+++ b/src/resolve/resolved-dnstls-openssl.c -@@ -6,6 +6,7 @@ - - #include <openssl/bio.h> - #include <openssl/err.h> -+#include <string.h> - - #include "io-util.h" - #include "resolved-dns-stream.h" -@@ -34,9 +35,11 @@ static int dnstls_flush_write_buffer(DnsStream *stream) { - return ss; - } else { - stream->dnstls_data.write_buffer->length -= ss; -- stream->dnstls_data.write_buffer->data += ss; - - if (stream->dnstls_data.write_buffer->length > 0) { -+ memmove(stream->dnstls_data.write_buffer->data, -+ stream->dnstls_data.write_buffer->data + ss, -+ stream->dnstls_data.write_buffer->length); - stream->dnstls_events |= EPOLLOUT; - return -EAGAIN; - } --- -2.17.1 - diff --git a/poky/meta/recipes-core/systemd/systemd/0002-network-do-not-send-ipv6.patch b/poky/meta/recipes-core/systemd/systemd/0002-network-do-not-send-ipv6.patch deleted file mode 100644 index 256531487..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0002-network-do-not-send-ipv6.patch +++ /dev/null @@ -1,96 +0,0 @@ -From b5c4eb818101127a606849e822937b15b8497c75 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe <watanabe.yu+github@gmail.com> -Date: Thu, 9 May 2019 14:39:46 +0900 -Subject: [PATCH] network: do not send ipv6 token to kernel - -We disabled kernel RA support. Then, we should not send -IFLA_INET6_TOKEN. -Thus, we do not need to send IFLA_INET6_ADDR_GEN_MODE twice. - -Follow-up for 0e2fdb83bb5e22047e0c7cc058b415d0e93f02cf and -4eb086a38712ea98faf41e075b84555b11b54362. - -Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com> - -Upstream-Status: Backport [https://github.com/systemd/systemd/commit/9f6e82e6eb3b6e73d66d00d1d6eee60691fb702f] - ---- - src/network/networkd-link.c | 51 +++++-------------------------------- - 1 file changed, 6 insertions(+), 45 deletions(-) - -diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c -index 042496173c..c49dba33da 100644 ---- a/src/network/networkd-link.c -+++ b/src/network/networkd-link.c -@@ -1940,6 +1940,9 @@ static int link_configure_addrgen_mode(Link *link) { - assert(link->manager); - assert(link->manager->rtnl); - -+ if (!socket_ipv6_is_supported()) -+ return 0; -+ - log_link_debug(link, "Setting address genmode for link"); - - r = sd_rtnl_message_new_link(link->manager->rtnl, &req, RTM_SETLINK, link->ifindex); -@@ -2033,46 +2036,6 @@ static int link_up(Link *link) { - return log_link_error_errno(link, r, "Could not set MAC address: %m"); - } - -- if (link_ipv6_enabled(link)) { -- uint8_t ipv6ll_mode; -- -- r = sd_netlink_message_open_container(req, IFLA_AF_SPEC); -- if (r < 0) -- return log_link_error_errno(link, r, "Could not open IFLA_AF_SPEC container: %m"); -- -- /* if the kernel lacks ipv6 support setting IFF_UP fails if any ipv6 options are passed */ -- r = sd_netlink_message_open_container(req, AF_INET6); -- if (r < 0) -- return log_link_error_errno(link, r, "Could not open AF_INET6 container: %m"); -- -- if (!in_addr_is_null(AF_INET6, &link->network->ipv6_token)) { -- r = sd_netlink_message_append_in6_addr(req, IFLA_INET6_TOKEN, &link->network->ipv6_token.in6); -- if (r < 0) -- return log_link_error_errno(link, r, "Could not append IFLA_INET6_TOKEN: %m"); -- } -- -- if (!link_ipv6ll_enabled(link)) -- ipv6ll_mode = IN6_ADDR_GEN_MODE_NONE; -- else if (sysctl_read_ip_property(AF_INET6, link->ifname, "stable_secret", NULL) < 0) -- /* The file may not exist. And event if it exists, when stable_secret is unset, -- * reading the file fails with EIO. */ -- ipv6ll_mode = IN6_ADDR_GEN_MODE_EUI64; -- else -- ipv6ll_mode = IN6_ADDR_GEN_MODE_STABLE_PRIVACY; -- -- r = sd_netlink_message_append_u8(req, IFLA_INET6_ADDR_GEN_MODE, ipv6ll_mode); -- if (r < 0) -- return log_link_error_errno(link, r, "Could not append IFLA_INET6_ADDR_GEN_MODE: %m"); -- -- r = sd_netlink_message_close_container(req); -- if (r < 0) -- return log_link_error_errno(link, r, "Could not close AF_INET6 container: %m"); -- -- r = sd_netlink_message_close_container(req); -- if (r < 0) -- return log_link_error_errno(link, r, "Could not close IFLA_AF_SPEC container: %m"); -- } -- - r = netlink_call_async(link->manager->rtnl, NULL, req, link_up_handler, - link_netlink_destroy_callback, link); - if (r < 0) -@@ -3208,11 +3171,9 @@ static int link_configure(Link *link) { - if (r < 0) - return r; - -- if (socket_ipv6_is_supported()) { -- r = link_configure_addrgen_mode(link); -- if (r < 0) -- return r; -- } -+ r = link_configure_addrgen_mode(link); -+ if (r < 0) -+ return r; - - return link_configure_after_setting_mtu(link); - } diff --git a/poky/meta/recipes-core/systemd/systemd/0006-network-remove-redunant-link-name-in-message.patch b/poky/meta/recipes-core/systemd/systemd/0006-network-remove-redunant-link-name-in-message.patch deleted file mode 100644 index 33f482ae9..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0006-network-remove-redunant-link-name-in-message.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9e6940858c7dbdd56b297bdf49f58d623e3430b7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> -Date: Tue, 7 May 2019 13:46:55 +0200 -Subject: [PATCH] network: remove redunant link name in message - -Fixes #12454. - -gcc was complaining that the link->ifname argument is NULL. Adding -assert(link->ifname) right before the call has no effect. It seems that -gcc is confused by the fact that log_link_warning_errno() internally -calls log_object(), with link->ifname passed as the object. log_object() -is also a macro and is does a check whether the passed object is NULL. -So we have a check if something is NULL right next an unconditional use -of it where it cannot be NULL. I think it's a bug in gcc. - -Anyway, we don't need to use link->ifname here. log_object() already prepends -the object name to the message. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: backport [https://github.com/systemd/systemd/commit/c98b3545008d8e984ab456dcf79787418fcbfe13] ---- - src/network/networkd-link.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c -index 3e334c8d29..a158c01bbd 100644 ---- a/src/network/networkd-link.c -+++ b/src/network/networkd-link.c -@@ -321,8 +321,7 @@ static int link_enable_ipv6(Link *link) { - - r = sysctl_write_ip_property_boolean(AF_INET6, link->ifname, "disable_ipv6", disabled); - if (r < 0) -- log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m", -- enable_disable(!disabled), link->ifname); -+ log_link_warning_errno(link, r, "Cannot %s IPv6: %m", enable_disable(!disabled)); - else - log_link_info(link, "IPv6 successfully %sd", enable_disable(!disabled)); - --- -2.21.0 - diff --git a/poky/meta/recipes-core/systemd/systemd_242.bb b/poky/meta/recipes-core/systemd/systemd_242.bb index b368ca8a2..2c101cbbb 100644 --- a/poky/meta/recipes-core/systemd/systemd_242.bb +++ b/poky/meta/recipes-core/systemd/systemd_242.bb @@ -22,12 +22,7 @@ SRC_URI += "file://touchscreen.rules \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://0004-rules-whitelist-hd-devices.patch \ file://0005-rules-watch-metadata-changes-in-ide-devices.patch \ - file://0006-network-remove-redunant-link-name-in-message.patch \ file://99-default.preset \ - file://0001-resolved-Fix-incorrect-use-of-OpenSSL-BUF_MEM.patch \ - file://0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch \ - file://0001-networkd-fix-link-up.patch \ - file://0002-network-do-not-send-ipv6.patch \ " # patches needed by musl @@ -88,6 +83,7 @@ PACKAGECONFIG ??= " \ quotacheck \ randomseed \ resolved \ + set-time-epoch \ smack \ sysusers \ timedated \ @@ -171,7 +167,12 @@ PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp" PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,initscripts-sushell" PACKAGECONFIG[smack] = "-Dsmack=true,-Dsmack=false" PACKAGECONFIG[sysusers] = "-Dsysusers=true,-Dsysusers=false" -PACKAGECONFIG[time-epoch] = "-Dtime-epoch=0,," +# When enabled use reproducble build timestamp if set as time epoch, +# or build time if not. When disabled, time epoch is unset. +def build_epoch(d): + epoch = d.getVar('SOURCE_DATE_EPOCH') or "-1" + return '-Dtime-epoch=%d' % int(epoch) +PACKAGECONFIG[set-time-epoch] = "${@build_epoch(d)},-Dtime-epoch=0" PACKAGECONFIG[timedated] = "-Dtimedated=true,-Dtimedated=false" PACKAGECONFIG[timesyncd] = "-Dtimesyncd=true,-Dtimesyncd=false" PACKAGECONFIG[usrmerge] = "-Dsplit-usr=false,-Dsplit-usr=true" @@ -210,6 +211,7 @@ EXTRA_OEMESON += "-Dkexec-path=${sbindir}/kexec \ -Dquotacheck-path=${sbindir}/quotacheck \ -Dquotaon-path=${sbindir}/quotaon \ -Dsulogin-path=${base_sbindir}/sulogin \ + -Dnologin-path=${base_sbindir}/nologin \ -Dumount-path=${base_bindir}/umount" do_install() { @@ -619,6 +621,12 @@ python __anonymous() { d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") } +python do_warn_musl() { + if d.getVar('TCLIBC') == "musl": + bb.warn("Using systemd with musl is not recommended since it is not supported upstream and some patches are known to be problematic.") +} +addtask warn_musl before do_configure + ALTERNATIVE_${PN} = "halt reboot shutdown poweroff runlevel resolv-conf" ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd" diff --git a/poky/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.32.bb b/poky/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.32.bb new file mode 100644 index 000000000..07a8e7c41 --- /dev/null +++ b/poky/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.32.bb @@ -0,0 +1,85 @@ +require binutils.inc +require binutils-${PV}.inc + +BPN = "binutils" + +DEPENDS += "dejagnu-native expect-native" +DEPENDS += "binutils-native" + +deltask do_compile +deltask do_install + +inherit nopackages + +do_configure[dirs] += "${B}/ld ${B}/bfd" +do_configure() { + # create config.h, oe enables initfini-array by default + echo "#define HAVE_INITFINI_ARRAY" > ${B}/ld/config.h + # use the bfd_stdint.h from binutils-native, this is the same of the one + # generated by binutils-cross + cp ${RECIPE_SYSROOT_NATIVE}/usr/include/bfd_stdint.h ${B}/bfd/ +} + +# target depends +DEPENDS += "virtual/${MLPREFIX}${TARGET_PREFIX}binutils" +DEPENDS += "virtual/${MLPREFIX}${TARGET_PREFIX}gcc" +DEPENDS += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs" +DEPENDS += "virtual/${MLPREFIX}libc" + +python check_prepare() { + def suffix_sys(sys): + if sys.endswith("-linux"): + return sys + "-gnu" + return sys + + def generate_site_exp(d, suite): + content = [] + content.append('set srcdir "{0}/{1}"'.format(d.getVar("S"), suite)) + content.append('set objdir "{0}/{1}"'.format(d.getVar("B"), suite)) + content.append('set build_alias "{0}"'.format(d.getVar("BUILD_SYS"))) + content.append('set build_triplet {0}'.format(d.getVar("BUILD_SYS"))) + # use BUILD here since HOST=TARGET + content.append('set host_alias "{0}"'.format(d.getVar("BUILD_SYS"))) + content.append('set host_triplet {0}'.format(d.getVar("BUILD_SYS"))) + content.append('set target_alias "{0}"'.format(d.getVar("TARGET_SYS"))) + content.append('set target_triplet {0}'.format(suffix_sys(d.getVar("TARGET_SYS")))) + content.append("set development true") + content.append("set experimental false") + + content.append(d.expand('set CXXFILT "${TARGET_PREFIX}c++filt"')) + content.append(d.expand('set CC "${TARGET_PREFIX}gcc --sysroot=${STAGING_DIR_TARGET} ${TUNE_CCARGS}"')) + content.append(d.expand('set CXX "${TARGET_PREFIX}g++ --sysroot=${STAGING_DIR_TARGET} ${TUNE_CCARGS}"')) + content.append(d.expand('set CFLAGS_FOR_TARGET "--sysroot=${STAGING_DIR_TARGET} ${TUNE_CCARGS}"')) + + if suite == "ld" and d.getVar("TUNE_ARCH") == "mips64": + # oe patches binutils to have the default mips64 abi as 64bit, but + # skips gas causing issues with the ld test suite (which uses gas) + content.append('set ASFLAGS "-64"') + + return "\n".join(content) + + for i in ["binutils", "gas", "ld"]: + builddir = os.path.join(d.getVar("B"), i) + if not os.path.isdir(builddir): + os.makedirs(builddir) + with open(os.path.join(builddir, "site.exp"), "w") as f: + f.write(generate_site_exp(d, i)) +} + +CHECK_TARGETS ??= "binutils gas ld" + +do_check[dirs] = "${B} ${B}/binutils ${B}/gas ${B}/ld" +do_check[prefuncs] += "check_prepare" +do_check[nostamp] = "1" +do_check() { + export LC_ALL=C + for i in ${CHECK_TARGETS}; do + (cd ${B}/$i; runtest \ + --tool $i \ + --srcdir ${S}/$i/testsuite \ + --ignore 'plugin.exp' \ + || true) + done +} +addtask check after do_configure + diff --git a/poky/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch b/poky/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch index ba5e4c2ce..5f4ac72f4 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch @@ -1,4 +1,4 @@ -From d540e95d05cd7c4b8924ac7b257c14ae0105d0ab Mon Sep 17 00:00:00 2001 +From 958a49749b772660d3bafb80748829cba6bed065 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:44:14 +0000 Subject: [PATCH 10/15] Change default emulation for mips64*-*-linux @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bfd/config.bfd b/bfd/config.bfd -index 0e1ddb659c..cc65547588 100644 +index 0e1ddb659c..d4f50f0a8d 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -919,12 +919,12 @@ case "${targ}" in @@ -30,7 +30,7 @@ index 0e1ddb659c..cc65547588 100644 - targ_defvec=mips_elf32_ntrad_be_vec - targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec" + targ_defvec=mips_elf64_trad_be_vec -+ targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_be_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec" ++ targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec" ;; mips*el-*-linux*) targ_defvec=mips_elf32_trad_le_vec @@ -54,6 +54,3 @@ index beba17ef51..917be6f8eb 100644 targ_extra_libpath=$targ_extra_emuls ;; mips*el-*-linux-*) targ_emul=elf32ltsmip targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" --- -2.20.1 - diff --git a/poky/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch b/poky/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch new file mode 100644 index 000000000..8ee6723df --- /dev/null +++ b/poky/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch @@ -0,0 +1,37 @@ +From b6d1a1ff2de363b1b76c8c70f77ae56a4e4d4b56 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 5 Sep 2019 18:37:31 +0800 +Subject: [PATCH] bootchart2: support usrmerge + +Upstream-Status: Inappropriate[oe-specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 1cc2974..f988904 100644 +--- a/Makefile ++++ b/Makefile +@@ -36,7 +36,7 @@ endif + PY_SITEDIR ?= $(PY_LIBDIR)/site-packages + LIBC_A_PATH = /usr$(LIBDIR) + # Always lib, even on systems that otherwise use lib64 +-SYSTEMD_UNIT_DIR = $(EARLY_PREFIX)/lib/systemd/system ++SYSTEMD_UNIT_DIR ?= $(EARLY_PREFIX)/lib/systemd/system + COLLECTOR = \ + collector/collector.o \ + collector/output.o \ +@@ -99,7 +99,7 @@ install-chroot: + install -d $(DESTDIR)$(PKGLIBDIR)/tmpfs + + install-collector: all install-chroot +- install -m 755 -D bootchartd $(DESTDIR)$(EARLY_PREFIX)/sbin/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX) ++ install -m 755 -D bootchartd $(DESTDIR)${BASE_SBINDIR}/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX) + install -m 644 -D bootchartd.conf $(DESTDIR)/etc/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX).conf + install -m 755 -D bootchart-collector $(DESTDIR)$(PKGLIBDIR)/$(PROGRAM_PREFIX)bootchart$(PROGRAM_SUFFIX)-collector + +-- +2.7.4 + diff --git a/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb b/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb index 396d0ec0a..a938b2da4 100644 --- a/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb +++ b/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb @@ -93,6 +93,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" SRC_URI = "git://github.com/xrmx/bootchart.git \ file://bootchartd_stop.sh \ file://0001-collector-Allocate-space-on-heap-for-chunks.patch \ + file://0001-bootchart2-support-usrmerge.patch \ " S = "${WORKDIR}/git" @@ -114,6 +115,8 @@ UPDATERCPN = "bootchartd-stop-initscript" INITSCRIPT_NAME = "bootchartd_stop.sh" INITSCRIPT_PARAMS = "start 99 2 3 4 5 ." +EXTRA_OEMAKE = 'BASE_SBINDIR="${base_sbindir}"' + do_compile_prepend () { export PY_LIBDIR="${libdir}/${PYTHON_DIR}" export BINDIR="${bindir}" @@ -126,6 +129,8 @@ do_install () { export BINDIR="${bindir}" export DESTDIR="${D}" export LIBDIR="${base_libdir}" + export PKGLIBDIR="${base_libdir}/bootchart" + export SYSTEMD_UNIT_DIR="${systemd_unitdir}/system" oe_runmake install install -d ${D}${sysconfdir}/init.d @@ -141,7 +146,7 @@ PACKAGES =+ "pybootchartgui" FILES_pybootchartgui += "${PYTHON_SITEPACKAGES_DIR}/pybootchartgui ${bindir}/pybootchartgui" RDEPENDS_pybootchartgui = "python3-pycairo python3-compression python3-image python3-shell python3-compression python3-codecs" RDEPENDS_${PN}_class-target += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit-pidof', 'procps', d)}" -RDEPENDS_${PN}_class-target += "lsb" +RDEPENDS_${PN}_class-target += "lsb-release" DEPENDS_append_class-native = " python3-pycairo-native" PACKAGES =+ "bootchartd-stop-initscript" diff --git a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.2.1.bb b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.2.1.bb index 647516cf9..a364cf53e 100644 --- a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.2.1.bb +++ b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.2.1.bb @@ -10,7 +10,7 @@ HOMEPAGE = "https://btrfs.wiki.kernel.org" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067" SECTION = "base" -DEPENDS = "util-linux attr e2fsprogs lzo acl python3-setuptools-native" +DEPENDS = "util-linux attr e2fsprogs lzo acl" DEPENDS_append_class-target = " udev" RDEPENDS_${PN} = "libgcc" @@ -19,13 +19,16 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ " -inherit autotools-brokensep pkgconfig manpages distutils3-base - -CLEANBROKEN = "1" - +PACKAGECONFIG ??= "python" PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native" +PACKAGECONFIG[python] = "--enable-python,--disable-python,python3-setuptools-native" PACKAGECONFIG[zstd] = "--enable-zstd,--disable-zstd,zstd" +inherit autotools-brokensep pkgconfig manpages +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'distutils3-base', '', d)} + +CLEANBROKEN = "1" + EXTRA_OECONF_append_libc-musl = " --disable-backtrace " EXTRA_PYTHON_CFLAGS = "${DEBUG_PREFIX_MAP}" EXTRA_PYTHON_CFLAGS_class-native = "" @@ -41,7 +44,9 @@ do_configure_prepend() { S = "${WORKDIR}/git" do_install_append() { - oe_runmake 'DESTDIR=${D}' 'PYTHON_SITEPACKAGES_DIR=${PYTHON_SITEPACKAGES_DIR}' install_python + if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then + oe_runmake 'DESTDIR=${D}' 'PYTHON_SITEPACKAGES_DIR=${PYTHON_SITEPACKAGES_DIR}' install_python + fi } BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-devtools/build-compare/build-compare_git.bb b/poky/meta/recipes-devtools/build-compare/build-compare_git.bb index efcf6b6dd..b0560cc27 100644 --- a/poky/meta/recipes-devtools/build-compare/build-compare_git.bb +++ b/poky/meta/recipes-devtools/build-compare/build-compare_git.bb @@ -6,22 +6,14 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "git://github.com/openSUSE/build-compare.git \ - file://Rename-rpm-check.sh-to-pkg-diff.sh.patch;striplevel=1 \ file://Ignore-DWARF-sections.patch;striplevel=1 \ - file://0001-Add-support-for-deb-and-ipk-packaging.patch \ - file://functions.sh-remove-space-at-head.patch \ - file://functions.sh-run-rpm-once-to-make-it-faster.patch \ - file://pkg-diff.sh-check-for-fifo-named-pipe.patch \ - file://pkg-diff.sh-check_single_file-return-at-once-when-sa.patch \ - file://pkg-diff.sh-remove-space-in-the-end-for-ftype.patch \ - file://functions.sh-improve-deb-and-ipk-checking.patch \ " # Date matches entry in build-compare.changes and date of SRCREV. # -SRCREV = "c5352c054c6ef15735da31b76d6d88620f4aff0a" +SRCREV = "4dfa207660776cae120afa4353aec7f1f2a998d2" PE = "1" -PV = "2015.02.10+git${SRCPV}" +PV = "2019.08.14+git${SRCPV}" UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/build-compare/files/0001-Add-support-for-deb-and-ipk-packaging.patch b/poky/meta/recipes-devtools/build-compare/files/0001-Add-support-for-deb-and-ipk-packaging.patch deleted file mode 100644 index 82fd8169f..000000000 --- a/poky/meta/recipes-devtools/build-compare/files/0001-Add-support-for-deb-and-ipk-packaging.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 02dbc7e3478e409d6f5e3e1c53daddf8838be999 Mon Sep 17 00:00:00 2001 -From: Paul Eggleton <paul.eggleton@linux.intel.com> -Date: Tue, 1 Sep 2015 12:04:33 +0100 -Subject: [PATCH] Add support for deb and ipk packaging - -Upstream-Status: Submitted [https://github.com/openSUSE/build-compare/pull/10] - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> ---- - functions.sh | 15 +++++++++++++++ - pkg-diff.sh | 6 ++++++ - 2 files changed, 21 insertions(+) - -diff --git a/functions.sh b/functions.sh -index 06079df..85c9003 100644 ---- a/functions.sh -+++ b/functions.sh -@@ -85,6 +85,13 @@ function unpackage() - CPIO_OPTS="--extract --unconditional --preserve-modification-time --make-directories --quiet" - rpm2cpio $file | cpio ${CPIO_OPTS} - ;; -+ *.ipk|*.deb) -+ ar x $file -+ tar xf control.tar.gz -+ rm control.tar.gz -+ tar xf data.tar.gz -+ rm data.tar.gz -+ ;; - esac - popd 1>/dev/null - } -@@ -255,4 +262,12 @@ function cmp_spec () - rm $file1 $file2 - return $RES - } -+ -+function adjust_controlfile() { -+ cat $1/control | sed '/^Version: /d' > $1/control.fixed -+ mv $1/control.fixed $1/control -+ cat $2/control | sed '/^Version: /d' > $2/control.fixed -+ mv $2/control.fixed $2/control -+} -+ - # vim: tw=666 ts=2 et -diff --git a/pkg-diff.sh b/pkg-diff.sh -index 0f1fa76..3cf10aa 100644 ---- a/pkg-diff.sh -+++ b/pkg-diff.sh -@@ -138,6 +138,12 @@ echo "Extracting packages" - unpackage $oldpkg $dir/old - unpackage $newpkg $dir/new - -+case $oldpkg in -+ *.deb|*.ipk) -+ adjust_controlfile $dir/old $dir/new -+ ;; -+esac -+ - # files is set in cmp_spec for rpms, so if RES is empty we should assume - # it wasn't an rpm and pick all files for comparison. - if [ -z $RES ]; then --- -2.1.0 - diff --git a/poky/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch b/poky/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch index 7dda1acbf..2fb62ae8c 100644 --- a/poky/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch +++ b/poky/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch @@ -23,18 +23,15 @@ Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg-diff.sh b/pkg-diff.sh -index 56035c1..0f1fa76 100755 +index 9c2125e..b0d77c8 100755 --- a/pkg-diff.sh +++ b/pkg-diff.sh -@@ -658,7 +658,7 @@ check_single_file() +@@ -851,7 +851,7 @@ check_single_file() echo "" >$file1 echo "" >$file2 - # Don't compare .build-id and .gnu_debuglink sections -- sections="$(objdump -s new/$file | grep "Contents of section .*:" | sed -r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" | tr "\n" " ")" -+ sections="$(objdump -s new/$file | grep "Contents of section .*:" | sed -r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" -e "\.debug_abbrev" -e "\.debug_aranges" -e "\.debug_frame" -e "\.debug_info" -e "\.debug_line" -e "\.debug_loc" -e "\.debug_macinfo" -e "\.debug_pubnames" -e "\.debug_pubtypes" -e "\.debug_ranges" -e "\.debug_str" | tr "\n" " ")" + # Don't compare .build-id, .gnu_debuglink and .gnu_debugdata sections +- sections="$($OBJDUMP -s new/$file | grep "Contents of section .*:" | sed -r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" -e "\.gnu_debugdata" | tr "\n" " ")" ++ sections="$($OBJDUMP -s new/$file | grep "Contents of section .*:" | sed -r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" -e "\.gnu_debugdata" -e "\.debug_abbrev" -e "\.debug_aranges" -e "\.debug_frame" -e "\.debug_info" -e "\.debug_line" -e "\.debug_loc" -e "\.debug_macinfo" -e "\.debug_pubnames" -e "\.debug_pubtypes" -e "\.debug_ranges" -e "\.debug_str" | tr "\n" " ")" for section in $sections; do - objdump -s -j $section old/$file | sed "s,^old/,," > $file1 - objdump -s -j $section new/$file | sed "s,^new/,," > $file2 --- -1.9.3 - + $OBJDUMP -s -j $section old/$file | sed "s,^old/,," > $file1 + $OBJDUMP -s -j $section new/$file | sed "s,^new/,," > $file2 diff --git a/poky/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch b/poky/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch deleted file mode 100644 index cff3a9e23..000000000 --- a/poky/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch +++ /dev/null @@ -1,1599 +0,0 @@ -From 4de3df5a1b361cd09a081f0e0bdb94cbf684ed48 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Thu, 19 Feb 2015 00:34:47 -0800 -Subject: [PATCH] Rename rpm-check.sh to pkg-diff.sh. - -The tool now accepts package input other than rpm, so change the name -which could be misleading. - -Upstream-Status: Submitted [https://github.com/openSUSE/build-compare/pulls] - -Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> - -Updated for rpm-check.sh. - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - build-compare.spec | 2 +- - pkg-diff.sh | 765 ++++++++++++++++++++++++++++++++++++++++++++++++++ - rpm-check.sh | 764 ------------------------------------------------- - same-build-result.sh | 4 +- - 4 files changed, 768 insertions(+), 767 deletions(-) - create mode 100644 pkg-diff.sh - delete mode 100755 rpm-check.sh - -diff --git a/build-compare.spec b/build-compare.spec -index 14a97e9..5f47ca1 100644 ---- a/build-compare.spec -+++ b/build-compare.spec -@@ -25,7 +25,7 @@ Version: 2015.02.10 - Release: 0 - Source1: COPYING - Source2: same-build-result.sh --Source3: rpm-check.sh -+Source3: pkg-diff.sh - Source4: functions.sh - Source5: srpm-check.sh - BuildRoot: %{_tmppath}/%{name}-%{version}-build -diff --git a/pkg-diff.sh b/pkg-diff.sh -new file mode 100644 -index 0000000..56035c1 ---- /dev/null -+++ b/pkg-diff.sh -@@ -0,0 +1,765 @@ -+#! /bin/bash -+# -+# Copyright (c) 2009, 2010, 2011, 2012 SUSE Linux Product GmbH, Germany. -+# Licensed under GPL v2, see COPYING file for details. -+# -+# Written by Michael Matz and Stephan Coolo -+# Enhanced by Andreas Jaeger -+ -+FUNCTIONS=${0%/*}/functions.sh -+ -+check_all= -+case $1 in -+ -a | --check-all) -+ check_all=1 -+ shift -+esac -+ -+if test "$#" != 2; then -+ echo "usage: $0 [-a|--check-all] old.rpm new.rpm" -+ exit 1 -+fi -+ -+self_script=$(cd $(dirname $0); echo $(pwd)/$(basename $0)) -+ -+source $FUNCTIONS -+ -+oldpkg=`readlink -f $1` -+newpkg=`readlink -f $2` -+rename_script=`mktemp` -+ -+if test ! -f "$oldpkg"; then -+ echo "can't open $1" -+ exit 1 -+fi -+ -+if test ! -f "$newpkg"; then -+ echo "can't open $2" -+ exit 1 -+fi -+ -+#usage unjar <file> -+function unjar() -+{ -+ local file -+ file=$1 -+ -+ if [[ $(type -p fastjar) ]]; then -+ UNJAR=fastjar -+ elif [[ $(type -p jar) ]]; then -+ UNJAR=jar -+ elif [[ $(type -p unzip) ]]; then -+ UNJAR=unzip -+ else -+ echo "ERROR: jar, fastjar, or unzip is not installed (trying file $file)" -+ exit 1 -+ fi -+ -+ case $UNJAR in -+ jar|fastjar) -+ # echo jar -xf $file -+ ${UNJAR} -xf $file -+ ;; -+ unzip) -+ unzip -oqq $file -+ ;; -+ esac -+} -+ -+# list files in directory -+#usage unjar_l <file> -+function unjar_l() -+{ -+ local file -+ file=$1 -+ -+ if [[ $(type -p fastjar) ]]; then -+ UNJAR=fastjar -+ elif [[ $(type -p jar) ]]; then -+ UNJAR=jar -+ elif [[ $(type -p unzip) ]]; then -+ UNJAR=unzip -+ else -+ echo "ERROR: jar, fastjar, or unzip is not installed (trying file $file)" -+ exit 1 -+ fi -+ -+ case $UNJAR in -+ jar|fastjar) -+ ${UNJAR} -tf $file -+ ;; -+ unzip) -+ unzip -l $file -+ ;; -+ esac -+} -+ -+filter_disasm() -+{ -+ sed -e 's/^ *[0-9a-f]\+://' -e 's/\$0x[0-9a-f]\+/$something/' -e 's/callq *[0-9a-f]\+/callq /' -e 's/# *[0-9a-f]\+/# /' -e 's/\(0x\)\?[0-9a-f]\+(/offset(/' -e 's/[0-9a-f]\+ </</' -e 's/^<\(.*\)>:/\1:/' -e 's/<\(.*\)+0x[0-9a-f]\+>/<\1 + ofs>/' -+} -+ -+echo "Comparing `basename $oldpkg` to `basename $newpkg`" -+ -+case $oldpkg in -+ *.rpm) -+ cmp_spec $rename_script $oldpkg $newpkg -+ RES=$? -+ case $RES in -+ 0) -+ echo "RPM meta information is identical" -+ if test -z "$check_all"; then -+ exit 0 -+ fi -+ ;; -+ 1) -+ echo "RPM meta information is different" -+ if test -z "$check_all"; then -+ exit 1 -+ fi -+ ;; -+ 2) -+ echo "RPM file checksum differs." -+ RES=0 -+ ;; -+ *) -+ echo "Wrong exit code!" -+ exit 1 -+ ;; -+ esac -+ ;; -+esac -+ -+file1=`mktemp` -+file2=`mktemp` -+ -+dir=`mktemp -d` -+echo "Extracting packages" -+unpackage $oldpkg $dir/old -+unpackage $newpkg $dir/new -+ -+# files is set in cmp_spec for rpms, so if RES is empty we should assume -+# it wasn't an rpm and pick all files for comparison. -+if [ -z $RES ]; then -+ oldfiles=`cd $dir/old; find . -type f` -+ newfiles=`cd $dir/new; find . -type f` -+ -+ files=`echo -e "$oldfiles\n$newfiles" | sort -u` -+fi -+ -+cd $dir -+bash $rename_script -+ -+dfile=`mktemp` -+ -+diff_two_files() -+{ -+ if ! cmp -s old/$file new/$file; then -+ echo "$file differs ($ftype)" -+ hexdump -C old/$file > $file1 -+ hexdump -C new/$file > $file2 -+ diff -u $file1 $file2 | head -n 200 -+ return 1 -+ fi -+ return 0 -+} -+ -+trim_man_first_line() -+{ -+ # Handles the first line if it is like: -+ #.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) -+ #.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3. -+ local f=$1 -+ sed -i -e '1{ -+ s|^\.\\"[[:blank:]]\+Automatically[[:blank:]]generated[[:blank:]]by[[:blank:]]Pod::Man[[:blank:]].*|.\\" Overly verbose Pod::Man| -+ s|^\.\\"[[:blank:]]\+DO[[:blank:]]NOT[[:blank:]]MODIFY[[:blank:]]THIS[[:blank:]]FILE![[:blank:]]\+It[[:blank:]]was[[:blank:]]generated[[:blank:]]by[[:blank:]]help2man[[:blank:]].*|.\\" Overly verbose help2man| -+ }' $f -+} -+ -+trim_man_TH() -+{ -+ # Handles lines like: -+ # .TH debhelper 7 "2010-02-27" "7.4.15" "Debhelper" -+ # .TH DIRMNGR-CLIENT 1 2010-02-27 "Dirmngr 1.0.3" "GNU Privacy Guard" -+ # .TH ccmake 1 "March 06, 2010" "ccmake 2.8.1-rc3" -+ # .TH QEMU-IMG 1 "2010-03-14" " " " " -+ # .TH kdecmake 1 "May 07, 2010" "cmake 2.8.1" -+ # .TH "appender.h" 3 "12 May 2010" "Version 1.2.1" "log4c" \" -*- nroff -*- -+ # .TH "appender.h" 3 "Tue Aug 31 2010" "Version 1.2.1" "log4c" \" -*- nroff -*- -+ # .TH "OFFLINEIMAP" "1" "11 May 2010" "John Goerzen" "OfflineIMAP Manual" -+ # .TH gv 3guile "13 May 2010" -+ #.TH "GIT\-ARCHIMPORT" "1" "09/13/2010" "Git 1\&.7\&.1" "Git Manual" -+ # .TH LDIRECTORD 8 "2010-10-20" "perl v5.12.2" "User Contributed Perl Documentation" -+ # .TH ccmake 1 "February 05, 2012" "ccmake 2.8.7" -+ # .TH "appender.h" 3 "Tue Aug 31 2010" "Version 1.2.1" "log4c" \" -*- nroff -*- -+ # .TH ARCH "1" "September 2010" "GNU coreutils 8.5" "User Commands" -+ # .TH "GCM-CALIBRATE" "1" "03 February 2012" "" "" -+ #.TH Locale::Po4a::Xml.pm 3pm "2015-01-30" "Po4a Tools" "Po4a Tools" -+ local f=$1 -+ # (.TH quoted section) (quoted_date)(*) -+ sed -i -e 's|^\([[:blank:]]*\.TH[[:blank:]]\+"[^"]\+"[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\("[^"]\+"\)\([[:blank:]]\+.*\)\?|\1 "qq2000-01-01"\3|' $f -+ # (.TH unquoted section) (quoted_date)(*) -+ sed -i -e 's|^\([[:blank:]]*\.TH[[:blank:]]\+[^"][^[:blank:]]\+[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\("[^"]\+"\)\([[:blank:]]\+.*\)\?|\1 "uq2000-02-02"\3|' $f -+ # (.TH quoted section) (unquoted_date)(*) -+ sed -i -e 's|^\([[:blank:]]*\.TH[[:blank:]]\+"[^"]\+"[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\([^"][^[:blank:]]\+\)\([[:blank:]]\+.*\)\?|\1 qu2000-03-03\3|' $f -+ # (.TH unquoted section) (unquoted_date)(*) -+ sed -i -e 's|^\([[:blank:]]*\.TH[[:blank:]]\+[^"][^[:blank:]]\+[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\([^"][^[:blank:]]\+\)\([[:blank:]]\+.*\)\?|\1 uu2000-04-04\3|' $f -+} -+ -+strip_numbered_anchors() -+{ -+ # Remove numbered anchors on Docbook / HTML files. -+ # This should be save since we remove them from old and new files. -+ # A trailing </a> or </div> tag will stay also on both files. -+ for f in old/$file new/$file; do -+ sed -i -e 's%<[ ]*a[ ]\+name[^<]*[0-9]\+[^<]*%%g' \ -+ -e 's%<[ ]*a[ ]\+href[^<]*#[^<]*[0-9]\+[^<]*%%g' \ -+ -e 's%<[^<]*id="ftn\.[^<]*[0-9]\+[^<]*%%g' $f -+ done -+} -+ -+ -+check_compressed_file() -+{ -+ local file=$1 -+ local ext=$2 -+ local tmpdir=`mktemp -d` -+ local ftype -+ local ret=0 -+ echo "$ext file with odd filename: $file" -+ if test -n "$tmpdir"; then -+ mkdir $tmpdir/{old,new} -+ cp --parents --dereference old/$file $tmpdir/ -+ cp --parents --dereference new/$file $tmpdir/ -+ if pushd $tmpdir > /dev/null ; then -+ case "$ext" in -+ bz2) -+ mv old/$file{,.bz2} -+ mv new/$file{,.bz2} -+ bzip2 -d old/$file.bz2 -+ bzip2 -d new/$file.bz2 -+ ;; -+ gzip) -+ mv old/$file{,.gz} -+ mv new/$file{,.gz} -+ gzip -d old/$file.gz -+ gzip -d new/$file.gz -+ ;; -+ xz) -+ mv old/$file{,.xz} -+ mv new/$file{,.xz} -+ xz -d old/$file.xz -+ xz -d new/$file.xz -+ ;; -+ esac -+ ftype=`/usr/bin/file old/$file | sed 's@^[^:]\+:[[:blank:]]*@@'` -+ case $ftype in -+ POSIX\ tar\ archive) -+ echo "$ext content is: $ftype" -+ mv old/$file{,.tar} -+ mv new/$file{,.tar} -+ if ! check_single_file ${file}.tar; then -+ ret=1 -+ fi -+ ;; -+ ASCII\ cpio\ archive\ *) -+ echo "$ext content is: $ftype" -+ mv old/$file{,.cpio} -+ mv new/$file{,.cpio} -+ if ! check_single_file ${file}.cpio; then -+ ret=1 -+ fi -+ ;; -+ *) -+ echo "unhandled $ext content: $ftype" -+ if ! diff_two_files; then -+ ret=1 -+ fi -+ ;; -+ esac -+ popd > /dev/null -+ fi -+ rm -rf "$tmpdir" -+ fi -+ return $ret -+} -+ -+check_single_file() -+{ -+ local file="$1" -+ case $file in -+ *.spec) -+ sed -i -e "s,Release:.*$release1,Release: @RELEASE@," old/$file -+ sed -i -e "s,Release:.*$release2,Release: @RELEASE@," new/$file -+ ;; -+ *.exe.mdb|*.dll.mdb) -+ # Just debug information, we can skip them -+ echo "$file skipped as debug file." -+ return 0 -+ ;; -+ *.a) -+ flist=`ar t new/$file` -+ pwd=$PWD -+ fdir=`dirname $file` -+ cd old/$fdir -+ ar x `basename $file` -+ cd $pwd/new/$fdir -+ ar x `basename $file` -+ cd $pwd -+ for f in $flist; do -+ if ! check_single_file $fdir/$f; then -+ return 1 -+ fi -+ done -+ return 0 -+ ;; -+ *.cpio) -+ flist=`cpio --quiet --list --force-local < "new/$file"` -+ pwd=$PWD -+ fdir=$file.extract.$PPID.$$ -+ mkdir old/$fdir new/$fdir -+ cd old/$fdir -+ cpio --quiet --extract --force-local < "../${file##*/}" -+ cd $pwd/new/$fdir -+ cpio --quiet --extract --force-local < "../${file##*/}" -+ cd $pwd -+ local ret=0 -+ for f in $flist; do -+ if ! check_single_file $fdir/$f; then -+ ret=1 -+ if test -z "$check_all"; then -+ break -+ fi -+ fi -+ done -+ rm -rf old/$fdir new/$fdir -+ return $ret -+ ;; -+ *.tar|*.tar.bz2|*.tar.gz|*.tgz|*.tbz2) -+ flist=`tar tf new/$file` -+ pwd=$PWD -+ fdir=`dirname $file` -+ cd old/$fdir -+ tar xf `basename $file` -+ cd $pwd/new/$fdir -+ tar xf `basename $file` -+ cd $pwd -+ local ret=0 -+ for f in $flist; do -+ if ! check_single_file $fdir/$f; then -+ ret=1 -+ if test -z "$check_all"; then -+ break -+ fi -+ fi -+ done -+ return $ret -+ ;; -+ *.zip|*.jar|*.war) -+ cd old -+ unjar_l ./$file |sort > flist -+ # 10-05-2010 14:39 -+ sed -i -e "s, [0-9][0-9]-[0-9][0-9]-[0-9]\+ [0-9][0-9]:[0-9][0-9] , date ," flist -+ # 2012-02-03 07:59 -+ sed -i -e "s, 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] , date ," flist -+ cd ../new -+ unjar_l ./$file |sort> flist -+ sed -i -e "s, [0-9][0-9]-[0-9][0-9]-[0-9]\+ [0-9][0-9]:[0-9][0-9] , date ,; " flist -+ sed -i -e "s, 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] , date ," flist -+ cd .. -+ if ! cmp -s old/flist new/flist; then -+ echo "$file has different file list" -+ diff -u old/flist new/flist -+ return 1 -+ fi -+ flist=`grep date new/flist | sed -e 's,.* date ,,'` -+ pwd=$PWD -+ fdir=`dirname $file` -+ cd old/$fdir -+ unjar `basename $file` -+ cd $pwd/new/$fdir -+ unjar `basename $file` -+ cd $pwd -+ local ret=0 -+ for f in $flist; do -+ if test -f new/$fdir/$f && ! check_single_file $fdir/$f; then -+ ret=1 -+ if test -z "$check_all"; then -+ break -+ fi -+ fi -+ done -+ return $ret;; -+ *.pyc|*.pyo) -+ perl -e "open fh, '+<', 'old/$file'; seek fh, 4, SEEK_SET; print fh '0000';" -+ perl -e "open fh, '+<', 'new/$file'; seek fh, 4, SEEK_SET; print fh '0000';" -+ ;; -+ *.bz2) -+ bunzip2 -c old/$file > old/${file/.bz2/} -+ bunzip2 -c new/$file > new/${file/.bz2/} -+ check_single_file ${file/.bz2/} -+ return $? -+ ;; -+ *.gz) -+ gunzip -c old/$file > old/${file/.gz/} -+ gunzip -c new/$file > new/${file/.gz/} -+ check_single_file ${file/.gz/} -+ return $? -+ ;; -+ *.rpm) -+ $self_script -a old/$file new/$file -+ return $? -+ ;; -+ *png) -+ # Try to remove timestamps, only if convert from ImageMagick is installed -+ if [[ $(type -p convert) ]]; then -+ convert old/$file +set date:create +set date:modify old/${file/.png/_n.png} -+ convert old/$file +set date:create +set date:modify new/${file/.png/_n.png} -+ if ! cmp -s old/${file/.png/_n.png} new/${file/.png/_n.png}; then -+ echo "$file differs ($ftype)" -+ hexdump -C old/${file/.png/_n.png} > $file1 -+ hexdump -C new/${file/.png/_n.png} > $file2 -+ diff -u $file1 $file2 | head -n 20 -+ return 1 -+ fi -+ return 0 -+ fi -+ ;; -+ /usr/share/locale/*/LC_MESSAGES/*.mo|/usr/share/locale-bundle/*/LC_MESSAGES/*.mo) -+ for f in old/$file new/$file; do -+ sed -i -e "s,POT-Creation-Date: ....-..-.. ..:..+....,POT-Creation-Date: 1970-01-01 00:00+0000," $f -+ done -+ ;; -+ /usr/share/doc/packages/*/*.html|\ -+ /usr/share/doc/kde/HTML/*/*/*.html|/usr/share/doc/*/html/*.html) -+ for f in old/$file new/$file; do -+ # texi2html output, e.g. in kvm, indent, qemu -+ sed -i -e "s|^<!-- Created on .*, 20.. by texi2html .\...|<!-- Created on August 7, 2009 by texi2html 1.82|" $f -+ sed -i -e 's|^ *This document was generated by <em>Autobuild</em> on <em>.*, 20..</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html .\...</em></a>.$| This document was generated by <em>Autobuild</em> on <em>August 7, 2009</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.82</em></a>.|' $f -+ # doxygen docu, e.g. in libssh and log4c -+ sed -i -e 's|Generated on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] 20[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f -+ # Generated on Sat Aug 14 2010 16:49:48 for libssh -+ sed -i -e 's|Generated on ... ... [0-9]* 20[0-9][0-9] [0-9]*:[0-9][0-9]:[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f -+ done -+ strip_numbered_anchors -+ ;; -+ /usr/share/javadoc/*.html |\ -+ /usr/share/javadoc/*/*.html|/usr/share/javadoc/*/*/*.html) -+ strip_numbered_anchors -+ # There are more timestamps in html, so far we handle only some primitive versions. -+ for f in old/$file new/$file; do -+ # Javadoc: -+ # <head> -+ # <!-- Generated by javadoc (version 1.7.0_75) on Tue Feb 03 02:20:12 GMT 2015 --> -+ # <!-- Generated by javadoc on Tue Feb 03 00:02:48 GMT 2015 --> -+ # <meta name="date" content="2015-02-03"> -+ # </head> -+ sed -i -e ' -+ /^<head>/{ -+ : next -+ n -+ /^<\/head>/{ -+ b end_head -+ } -+ s/^\(<!-- Generated by javadoc\) \((\(build\|version\) [0-9._]\+) on ... ... .. ..:..:.. \(GMT\|UTC\) ....\) \(-->\)/\1 some-date-removed-by-build-compare \5/ -+ t next -+ s/^\(<!-- Generated by javadoc\) \(on ... ... .. ..:..:.. \(GMT\|UTC\) ....\) \(-->\)/\1 some-date-removed-by-build-compare \3/ -+ t next -+ s/^<meta name="date" content="[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}">/<meta name="date" content="some-date-removed-by-build-compare">/ -+ b next -+ } -+ : end_head -+ ' $f -+ # Gjdoc HtmlDoclet: -+ sed -i -e 's%Generated by Gjdoc HtmlDoclet [0-9,.]*, part of <a href="http://www.gnu.org/software/classpath/cp-tools/" title="" target="_top">GNU Classpath Tools</a>, on .*, 20.. [0-9]*:..:.. \(a\|p\)\.m\. GMT.%Generated by Gjdoc.%' $f -+ sed -i -e 's%<!DOCTYPE html PUBLIC "-//gnu.org///DTD XHTML 1.1 plus Target 1.0//EN"\(.*\)GNU Classpath Tools</a>, on [A-Z][a-z]* [0-9]*, 20?? [0-9]*:??:?? \(a|p\)\.m\. GMT.</p>%<!DOCTYPE html PUBLIC "-//gnu.org///DTD XHTML 1.1 plus Target 1.0//EN"\1GNU Classpath Tools</a>, on January 1, 2009 0:00:00 a.m. GMT.</p>%' $f -+ sed -i -e 's%<!DOCTYPE html PUBLIC "-//gnu.org///DTD\(.*GNU Classpath Tools</a>\), on [a-zA-Z]* [0-9][0-9], 20.. [0-9]*:..:.. \(a\|p\)\.m\. GMT.</p>%<!DOCTYPE html PUBLIC "-//gnu.org///DTD\1,on May 1, 2010 1:11:42 p.m. GMT.</p>%' $f -+ # deprecated-list is randomly ordered, sort it for comparison -+ case $f in -+ */deprecated-list.html) -+ sort -o $f $f -+ ;; -+ esac -+ done -+ ;; -+ /usr/share/javadoc/gjdoc.properties |\ -+ /usr/share/javadoc/*/gjdoc.properties) -+ for f in old/$file new/$file; do -+ sed -i -e 's|^#[A-Z][a-z]\{2\} [A-Z][a-z]\{2\} [0-9]\{2\} ..:..:.. GMT 20..$|#Fri Jan 01 11:27:36 GMT 2009|' $f -+ done -+ ;; -+ */fonts.scale|*/fonts.dir|*/encodings.dir) -+ for f in old/$file new/$file; do -+ # sort files before comparing -+ sort -o $f $f -+ done -+ ;; -+ /var/adm/perl-modules/*) -+ for f in old/$file new/$file; do -+ sed -i -e 's|^=head2 ... ... .. ..:..:.. ....: C<Module>|=head2 Wed Jul 1 00:00:00 2009: C<Module>|' $f -+ done -+ ;; -+ /usr/share/man/man3/*3pm) -+ for f in old/$file new/$file; do -+ sed -i -e 's| 3 "20..-..-.." "perl v5....." "User Contributed Perl Documentation"$| 3 "2009-01-01" "perl v5.10.0" "User Contributed Perl Documentation"|' $f -+ trim_man_TH $f -+ trim_man_first_line $f -+ done -+ ;; -+ /usr/share/man/*/man*|/usr/share/man/man*|/usr/lib/texmf/doc/man/*/*) -+ -+ for f in old/$file new/$file; do -+ trim_man_TH $f -+ trim_man_first_line $f -+ # generated by docbook xml: -+ #.\" Date: 09/13/2010 -+ sed -i -e 's|Date: [0-1][0-9]/[0-9][0-9]/201[0-9]|Date: 09/13/2010|' $f -+ done -+ ;; -+ *.elc) -+ # emacs lisp files -+ for f in old/$file new/$file; do -+ sed -i -e 's|Compiled by abuild@.* on ... ... .. ..:..:.. 20..$|compiled by abuild@buildhost on Wed Jul 01 00:00:00 2009|' $f -+ done -+ ;; -+ /var/lib/texmf/web2c/*/*fmt |\ -+ /var/lib/texmf/web2c/metafont/*.base|\ -+ /var/lib/texmf/web2c/metapost/*.mem) -+ # binary dump of TeX and Metafont formats, we can ignore them for good -+ echo "difference in $file ignored." -+ return 0 -+ ;; -+ */libtool) -+ for f in old/$file new/$file; do -+ sed -i -e 's|^# Libtool was configured on host [A-Za-z0-9]*:$|# Libtool was configured on host x42:|' $f -+ done -+ ;; -+ /etc/mail/*cf|/etc/sendmail.cf) -+ # from sendmail package -+ for f in old/$file new/$file; do -+ # - ##### built by abuild@build33 on Thu May 6 11:21:17 UTC 2010 -+ sed -i -e 's|built by abuild@[a-z0-9]* on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] .* 20[0-9][0-9]|built by abuild@build42 on Thu May 6 11:21:17 UTC 2010|' $f -+ done -+ ;; -+ /usr/share/doc/kde/HTML/*/*/index.cache|/usr/share/doc/kde/HTML/*/*/*/index.cache|\ -+ /usr/share/gtk-doc/html/*/*.html|/usr/share/gtk-doc/html/*/*.devhelp2) -+ # various kde and gtk packages -+ strip_numbered_anchors -+ ;; -+ */created.rid) -+ # ruby documentation -+ # file just contains a timestamp and nothing else, so ignore it -+ echo "Ignore $file" -+ return 0 -+ ;; -+ */rdoc/files/*.html) -+ # ruby documentation -+ # <td>Mon Sep 20 19:02:43 +0000 2010</td> -+ for f in old/$file new/$file; do -+ sed -i -e 's%<td>[A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]\+ [0-9]\+:[0-9]\+:[0-9]\+ +0000 201[0-9]</td>%<td>Mon Sep 20 19:02:43 +0000 2010</td>%g' $f -+ done -+ strip_numbered_anchors -+ ;; -+ */Linux*Env.Set.sh) -+ # LibreOffice files, contains: -+ # Generated on: Mon Apr 18 13:19:22 UTC 2011 -+ for f in old/$file new/$file; do -+ sed -i -e 's%^# Generated on:.*UTC 201[0-9] *$%# Generated on: Sometime%g' $f -+ done -+ ;; -+ /usr/lib/libreoffice/solver/inc/*/deliver.log) -+ # LibreOffice log file -+ echo "Ignore $file" -+ return 0 -+ ;; -+ /var/adm/update-messages/*|/var/adm/update-scripts/*) -+ # encode version-release inside -+ oldfn=`echo "$file"|sed -e s/-$release2/-$release1/;` -+ -+ # fetchmsttfonts embeds the release number in the update shell script. -+ echo sed -i -e "s/-$release1/-$release2/g;" "old/$oldfn" -+ sed -i -e "s/-$release1/-$release2/g;" "old/$oldfn" -+ -+ if ! diff -u old/$oldfn new/$file; then -+ echo "$oldfn is not same as $file" -+ return 1 -+ fi -+ echo "$file and $oldfn are same" -+ return 0 -+ ;; -+ *.ps) -+ for f in "old/$file" "new/$file"; do -+ sed -i -e ' -+ /^%%CreationDate:[[:blank:]]/d -+ /^%%Creator:[[:blank:]]groff[[:blank:]]version[[:blank:]]/d -+ /^%DVIPSSource:[[:blank:]]/d -+ ' "$f" -+ done -+ ;; -+ *pdf) -+ # PDF files contain a unique ID, remove it -+ # Format of the ID is: -+ # /ID [<9ACE247A70CF9BEAFEE15E116259BD6D> <9ACE247A70CF9BEAFEE15E116259BD6D>] -+ # with optional spaces. pdftex creates also: -+ # /CreationDate (D:20120103083206Z) -+ # /ModDate (D:20120103083206Z) -+ # and possibly XML metadata as well -+ for f in "old/$file" "new/$file"; do -+ sed -i \ -+ '/obj/,/endobj/{ -+ s%/ID \?\[ \?<[^>]\+> \?<[^>]\+> \?\]%/IDrandom%g; -+ s%/CreationDate \?(D:[^)]*)%/CreationDate (D: XXX)%g; -+ s%/ModDate \?(D:[^)]*)%/ModDate (D: XXX)%g; -+ s%<pdf:CreationDate>[^<]*</pdf:CreationDate>%<pdf:CreationDate>XXX</pdf:CreationDate>%g; -+ s%<pdf:ModDate>[^<]*</pdf:ModDate>%<pdf:ModDate>XXX</pdf:ModDate>%g; -+ s%<xap:CreateDate>[^<]*</xap:CreateDate>%<xap:CreateDate>XXX</xap:CreateDate>%g; -+ s%<xap:ModifyDate>[^<]*</xap:ModifyDate>%<xap:ModifyDate>XXX</xap:ModifyDate>%g; -+ s%<xap:MetadataDate>[^<]*</xap:MetadataDate>%<xap:MetadataDate>XXX</xap:MetadataDate>%g; -+ }' "$f" -+ done -+ ;; -+ esac -+ -+ ftype=`/usr/bin/file old/$file | sed 's@^[^:]\+:[[:blank:]]*@@'` -+ case $ftype in -+ PE32\ executable*Mono\/\.Net\ assembly*) -+ echo "PE32 Mono/.Net assembly: $file" -+ if [ -x /usr/bin/monodis ] ; then -+ monodis old/$file 2>/dev/null|sed -e 's/GUID = {.*}/GUID = { 42 }/;'> ${file1} -+ monodis new/$file 2>/dev/null|sed -e 's/GUID = {.*}/GUID = { 42 }/;'> ${file2} -+ if ! cmp -s ${file1} ${file2}; then -+ echo "$file differs ($ftype)" -+ diff -u ${file1} ${file2} -+ return 1 -+ fi -+ else -+ echo "Cannot compare, no monodis installed" -+ return 1 -+ fi -+ ;; -+ ELF*executable*|ELF*[LM]SB\ shared\ object*) -+ objdump -d --no-show-raw-insn old/$file | filter_disasm > $file1 -+ if ! test -s $file1; then -+ # objdump has no idea how to handle it -+ if ! diff_two_files; then -+ ret=1 -+ break -+ fi -+ fi -+ elfdiff= -+ sed -i -e "s,old/,," $file1 -+ objdump -d --no-show-raw-insn new/$file | filter_disasm > $file2 -+ sed -i -e "s,new/,," $file2 -+ if ! diff -u $file1 $file2 > $dfile; then -+ echo "$file differs in assembler output" -+ head -n 200 $dfile -+ elfdiff="1" -+ fi -+ echo "" >$file1 -+ echo "" >$file2 -+ # Don't compare .build-id and .gnu_debuglink sections -+ sections="$(objdump -s new/$file | grep "Contents of section .*:" | sed -r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" | tr "\n" " ")" -+ for section in $sections; do -+ objdump -s -j $section old/$file | sed "s,^old/,," > $file1 -+ objdump -s -j $section new/$file | sed "s,^new/,," > $file2 -+ if ! diff -u $file1 $file2 > $dfile; then -+ echo "$file differs in ELF section $section" -+ head -n 200 $dfile -+ elfdiff="1" -+ fi -+ done -+ if test -z "$elfdiff"; then -+ echo "$file: only difference was in build-id or gnu_debuglink, GOOD." -+ return 0 -+ fi -+ return 1 -+ ;; -+ *ASCII*|*text*) -+ if ! cmp -s old/$file new/$file; then -+ echo "$file differs ($ftype)" -+ diff -u old/$file new/$file | head -n 200 -+ return 1 -+ fi -+ ;; -+ directory|setuid,\ directory|sticky,\ directory) -+ # tar might package directories - ignore them here -+ return 0 -+ ;; -+ bzip2\ compressed\ data*) -+ if ! check_compressed_file "$file" "bz2"; then -+ return 1 -+ fi -+ ;; -+ gzip\ compressed\ data*) -+ if ! check_compressed_file "$file" "gzip"; then -+ return 1 -+ fi -+ ;; -+ XZ\ compressed\ data*) -+ if ! check_compressed_file "$file" "xz"; then -+ return 1 -+ fi -+ ;; -+ POSIX\ tar\ archive) -+ mv old/$file{,.tar} -+ mv new/$file{,.tar} -+ if ! check_single_file ${file}.tar; then -+ return 1 -+ fi -+ ;; -+ cpio\ archive) -+ mv old/$file{,.cpio} -+ mv new/$file{,.cpio} -+ if ! check_single_file ${file}.cpio; then -+ return 1 -+ fi -+ ;; -+ symbolic\ link\ to\ *) -+ readlink "old/$file" > $file1 -+ readlink "new/$file" > $file2 -+ if ! diff -u $file1 $file2; then -+ echo "symlink target for $file differs" -+ return 1 -+ fi -+ ;; -+ *) -+ if ! diff_two_files; then -+ return 1 -+ fi -+ ;; -+ esac -+ return 0 -+} -+ -+# We need /proc mounted for some tests, so check that it's mounted and -+# complain if not. -+PROC_MOUNTED=0 -+if [ ! -d /proc/self/ ]; then -+ echo "/proc is not mounted" -+ mount -orw -n -tproc none /proc -+ PROC_MOUNTED=1 -+fi -+ -+# preserve cmp_spec result for check_all runs -+ret=$RES -+for file in $files; do -+ if ! check_single_file $file; then -+ ret=1 -+ if test -z "$check_all"; then -+ break -+ fi -+ fi -+done -+ -+if [ "$PROC_MOUNTED" -eq "1" ]; then -+ echo "Unmounting proc" -+ umount /proc -+fi -+ -+rm $file1 $file2 $dfile $rename_script -+rm -rf $dir -+if test "$ret" = 0; then -+ echo "Package content is identical" -+fi -+exit $ret -+# vim: tw=666 ts=2 et -diff --git a/rpm-check.sh b/rpm-check.sh -deleted file mode 100755 -index dd47642..0000000 ---- a/rpm-check.sh -+++ /dev/null -@@ -1,764 +0,0 @@ --#! /bin/bash --# --# Copyright (c) 2009, 2010, 2011, 2012 SUSE Linux Product GmbH, Germany. --# Licensed under GPL v2, see COPYING file for details. --# --# Written by Michael Matz and Stephan Coolo --# Enhanced by Andreas Jaeger -- --FUNCTIONS=${0%/*}/functions.sh -- --check_all= --case $1 in -- -a | --check-all) -- check_all=1 -- shift --esac -- --if test "$#" != 2; then -- echo "usage: $0 [-a|--check-all] old.rpm new.rpm" -- exit 1 --fi -- --self_script=$(cd $(dirname $0); echo $(pwd)/$(basename $0)) -- --source $FUNCTIONS -- --oldpkg=`readlink -f $1` --newpkg=`readlink -f $2` --rename_script=`mktemp` -- --if test ! -f "$oldpkg"; then -- echo "can't open $1" -- exit 1 --fi -- --if test ! -f "$newpkg"; then -- echo "can't open $2" -- exit 1 --fi -- --#usage unjar <file> --function unjar() --{ -- local file -- file=$1 -- -- if [[ $(type -p fastjar) ]]; then -- UNJAR=fastjar -- elif [[ $(type -p jar) ]]; then -- UNJAR=jar -- elif [[ $(type -p unzip) ]]; then -- UNJAR=unzip -- else -- echo "ERROR: jar, fastjar, or unzip is not installed (trying file $file)" -- exit 1 -- fi -- -- case $UNJAR in -- jar|fastjar) -- # echo jar -xf $file -- ${UNJAR} -xf $file -- ;; -- unzip) -- unzip -oqq $file -- ;; -- esac --} -- --# list files in directory --#usage unjar_l <file> --function unjar_l() --{ -- local file -- file=$1 -- -- if [[ $(type -p fastjar) ]]; then -- UNJAR=fastjar -- elif [[ $(type -p jar) ]]; then -- UNJAR=jar -- elif [[ $(type -p unzip) ]]; then -- UNJAR=unzip -- else -- echo "ERROR: jar, fastjar, or unzip is not installed (trying file $file)" -- exit 1 -- fi -- -- case $UNJAR in -- jar|fastjar) -- ${UNJAR} -tf $file -- ;; -- unzip) -- unzip -l $file -- ;; -- esac --} -- --filter_disasm() --{ -- sed -e 's/^ *[0-9a-f]\+://' -e 's/\$0x[0-9a-f]\+/$something/' -e 's/callq *[0-9a-f]\+/callq /' -e 's/# *[0-9a-f]\+/# /' -e 's/\(0x\)\?[0-9a-f]\+(/offset(/' -e 's/[0-9a-f]\+ </</' -e 's/^<\(.*\)>:/\1:/' -e 's/<\(.*\)+0x[0-9a-f]\+>/<\1 + ofs>/' --} -- --echo "Comparing `basename $oldpkg` to `basename $newpkg`" -- --case $oldpkg in -- *.rpm) -- cmp_spec $rename_script $oldpkg $newpkg -- RES=$? -- case $RES in -- 0) -- echo "RPM meta information is identical" -- if test -z "$check_all"; then -- exit 0 -- fi -- ;; -- 1) -- echo "RPM meta information is different" -- if test -z "$check_all"; then -- exit 1 -- fi -- ;; -- 2) -- echo "RPM file checksum differs." -- RES=0 -- ;; -- *) -- echo "Wrong exit code!" -- exit 1 -- ;; -- esac -- ;; --esac -- --file1=`mktemp` --file2=`mktemp` -- --dir=`mktemp -d` --echo "Extracting packages" --unpackage $oldpkg $dir/old --unpackage $newpkg $dir/new -- --# files is set in cmp_spec for rpms, so if RES is empty we should assume --# it wasn't an rpm and pick all files for comparison. --if [ -z $RES ]; then -- oldfiles=`cd $dir/old; find . -type f` -- newfiles=`cd $dir/new; find . -type f` -- -- files=`echo -e "$oldfiles\n$newfiles" | sort -u` --fi -- --cd $dir --bash $rename_script -- --dfile=`mktemp` -- --diff_two_files() --{ -- if ! cmp -s old/$file new/$file; then -- echo "$file differs ($ftype)" -- hexdump -C old/$file > $file1 -- hexdump -C new/$file > $file2 -- diff -u $file1 $file2 | head -n 200 -- return 1 -- fi -- return 0 --} -- --trim_man_first_line() --{ -- # Handles the first line if it is like: -- #.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) -- #.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3. -- local f=$1 -- sed -i -e '1{ -- s|^\.\\"[[:blank:]]\+Automatically[[:blank:]]generated[[:blank:]]by[[:blank:]]Pod::Man[[:blank:]].*|.\\" Overly verbose Pod::Man| -- s|^\.\\"[[:blank:]]\+DO[[:blank:]]NOT[[:blank:]]MODIFY[[:blank:]]THIS[[:blank:]]FILE![[:blank:]]\+It[[:blank:]]was[[:blank:]]generated[[:blank:]]by[[:blank:]]help2man[[:blank:]].*|.\\" Overly verbose help2man| -- }' $f --} -- --trim_man_TH() --{ -- # Handles lines like: -- # .TH debhelper 7 "2010-02-27" "7.4.15" "Debhelper" -- # .TH DIRMNGR-CLIENT 1 2010-02-27 "Dirmngr 1.0.3" "GNU Privacy Guard" -- # .TH ccmake 1 "March 06, 2010" "ccmake 2.8.1-rc3" -- # .TH QEMU-IMG 1 "2010-03-14" " " " " -- # .TH kdecmake 1 "May 07, 2010" "cmake 2.8.1" -- # .TH "appender.h" 3 "12 May 2010" "Version 1.2.1" "log4c" \" -*- nroff -*- -- # .TH "appender.h" 3 "Tue Aug 31 2010" "Version 1.2.1" "log4c" \" -*- nroff -*- -- # .TH "OFFLINEIMAP" "1" "11 May 2010" "John Goerzen" "OfflineIMAP Manual" -- # .TH gv 3guile "13 May 2010" -- #.TH "GIT\-ARCHIMPORT" "1" "09/13/2010" "Git 1\&.7\&.1" "Git Manual" -- # .TH LDIRECTORD 8 "2010-10-20" "perl v5.12.2" "User Contributed Perl Documentation" -- # .TH ccmake 1 "February 05, 2012" "ccmake 2.8.7" -- # .TH "appender.h" 3 "Tue Aug 31 2010" "Version 1.2.1" "log4c" \" -*- nroff -*- -- # .TH ARCH "1" "September 2010" "GNU coreutils 8.5" "User Commands" -- # .TH "GCM-CALIBRATE" "1" "03 February 2012" "" "" -- #.TH Locale::Po4a::Xml.pm 3pm "2015-01-30" "Po4a Tools" "Po4a Tools" -- local f=$1 -- # (.TH quoted section) (quoted_date)(*) -- sed -i -e 's|^\([[:blank:]]*\.TH[[:blank:]]\+"[^"]\+"[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\("[^"]\+"\)\([[:blank:]]\+.*\)\?|\1 "qq2000-01-01"\3|' $f -- # (.TH unquoted section) (quoted_date)(*) -- sed -i -e 's|^\([[:blank:]]*\.TH[[:blank:]]\+[^"][^[:blank:]]\+[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\("[^"]\+"\)\([[:blank:]]\+.*\)\?|\1 "uq2000-02-02"\3|' $f -- # (.TH quoted section) (unquoted_date)(*) -- sed -i -e 's|^\([[:blank:]]*\.TH[[:blank:]]\+"[^"]\+"[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\([^"][^[:blank:]]\+\)\([[:blank:]]\+.*\)\?|\1 qu2000-03-03\3|' $f -- # (.TH unquoted section) (unquoted_date)(*) -- sed -i -e 's|^\([[:blank:]]*\.TH[[:blank:]]\+[^"][^[:blank:]]\+[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\([^"][^[:blank:]]\+\)\([[:blank:]]\+.*\)\?|\1 uu2000-04-04\3|' $f --} -- --strip_numbered_anchors() --{ -- # Remove numbered anchors on Docbook / HTML files. -- # This should be save since we remove them from old and new files. -- # A trailing </a> or </div> tag will stay also on both files. -- for f in old/$file new/$file; do -- sed -i -e 's%<[ ]*a[ ]\+name[^<]*[0-9]\+[^<]*%%g' \ -- -e 's%<[ ]*a[ ]\+href[^<]*#[^<]*[0-9]\+[^<]*%%g' \ -- -e 's%<[^<]*id="ftn\.[^<]*[0-9]\+[^<]*%%g' $f -- done --} -- -- --check_compressed_file() --{ -- local file=$1 -- local ext=$2 -- local tmpdir=`mktemp -d` -- local ftype -- local ret=0 -- echo "$ext file with odd filename: $file" -- if test -n "$tmpdir"; then -- mkdir $tmpdir/{old,new} -- cp --parents --dereference old/$file $tmpdir/ -- cp --parents --dereference new/$file $tmpdir/ -- if pushd $tmpdir > /dev/null ; then -- case "$ext" in -- bz2) -- mv old/$file{,.bz2} -- mv new/$file{,.bz2} -- bzip2 -d old/$file.bz2 -- bzip2 -d new/$file.bz2 -- ;; -- gzip) -- mv old/$file{,.gz} -- mv new/$file{,.gz} -- gzip -d old/$file.gz -- gzip -d new/$file.gz -- ;; -- xz) -- mv old/$file{,.xz} -- mv new/$file{,.xz} -- xz -d old/$file.xz -- xz -d new/$file.xz -- ;; -- esac -- ftype=`/usr/bin/file old/$file | sed 's@^[^:]\+:[[:blank:]]*@@'` -- case $ftype in -- POSIX\ tar\ archive) -- echo "$ext content is: $ftype" -- mv old/$file{,.tar} -- mv new/$file{,.tar} -- if ! check_single_file ${file}.tar; then -- ret=1 -- fi -- ;; -- ASCII\ cpio\ archive\ *) -- echo "$ext content is: $ftype" -- mv old/$file{,.cpio} -- mv new/$file{,.cpio} -- if ! check_single_file ${file}.cpio; then -- ret=1 -- fi -- ;; -- *) -- echo "unhandled $ext content: $ftype" -- if ! diff_two_files; then -- ret=1 -- fi -- ;; -- esac -- popd > /dev/null -- fi -- rm -rf "$tmpdir" -- fi -- return $ret --} -- --check_single_file() --{ -- local file="$1" -- case $file in -- *.spec) -- sed -i -e "s,Release:.*$release1,Release: @RELEASE@," old/$file -- sed -i -e "s,Release:.*$release2,Release: @RELEASE@," new/$file -- ;; -- *.exe.mdb|*.dll.mdb) -- # Just debug information, we can skip them -- echo "$file skipped as debug file." -- return 0 -- ;; -- *.a) -- flist=`ar t new/$file` -- pwd=$PWD -- fdir=`dirname $file` -- cd old/$fdir -- ar x `basename $file` -- cd $pwd/new/$fdir -- ar x `basename $file` -- cd $pwd -- for f in $flist; do -- if ! check_single_file $fdir/$f; then -- return 1 -- fi -- done -- return 0 -- ;; -- *.cpio) -- flist=`cpio --quiet --list --force-local < "new/$file"` -- pwd=$PWD -- fdir=$file.extract.$PPID.$$ -- mkdir old/$fdir new/$fdir -- cd old/$fdir -- cpio --quiet --extract --force-local < "../${file##*/}" -- cd $pwd/new/$fdir -- cpio --quiet --extract --force-local < "../${file##*/}" -- cd $pwd -- local ret=0 -- for f in $flist; do -- if ! check_single_file $fdir/$f; then -- ret=1 -- if test -z "$check_all"; then -- break -- fi -- fi -- done -- rm -rf old/$fdir new/$fdir -- return $ret -- ;; -- *.tar|*.tar.bz2|*.tar.gz|*.tgz|*.tbz2) -- flist=`tar tf new/$file` -- pwd=$PWD -- fdir=`dirname $file` -- cd old/$fdir -- tar xf `basename $file` -- cd $pwd/new/$fdir -- tar xf `basename $file` -- cd $pwd -- local ret=0 -- for f in $flist; do -- if ! check_single_file $fdir/$f; then -- ret=1 -- if test -z "$check_all"; then -- break -- fi -- fi -- done -- return $ret -- ;; -- *.zip|*.jar|*.war) -- cd old -- unjar_l ./$file |sort > flist -- # 10-05-2010 14:39 -- sed -i -e "s, [0-9][0-9]-[0-9][0-9]-[0-9]\+ [0-9][0-9]:[0-9][0-9] , date ," flist -- # 2012-02-03 07:59 -- sed -i -e "s, 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] , date ," flist -- cd ../new -- unjar_l ./$file |sort> flist -- sed -i -e "s, [0-9][0-9]-[0-9][0-9]-[0-9]\+ [0-9][0-9]:[0-9][0-9] , date ,; " flist -- sed -i -e "s, 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] , date ," flist -- cd .. -- if ! cmp -s old/flist new/flist; then -- echo "$file has different file list" -- diff -u old/flist new/flist -- return 1 -- fi -- flist=`grep date new/flist | sed -e 's,.* date ,,'` -- pwd=$PWD -- fdir=`dirname $file` -- cd old/$fdir -- unjar `basename $file` -- cd $pwd/new/$fdir -- unjar `basename $file` -- cd $pwd -- local ret=0 -- for f in $flist; do -- if test -f new/$fdir/$f && ! check_single_file $fdir/$f; then -- ret=1 -- if test -z "$check_all"; then -- break -- fi -- fi -- done -- return $ret;; -- *.pyc|*.pyo) -- perl -e "open fh, '+<', 'old/$file'; seek fh, 4, SEEK_SET; print fh '0000';" -- perl -e "open fh, '+<', 'new/$file'; seek fh, 4, SEEK_SET; print fh '0000';" -- ;; -- *.bz2) -- bunzip2 -c old/$file > old/${file/.bz2/} -- bunzip2 -c new/$file > new/${file/.bz2/} -- check_single_file ${file/.bz2/} -- return $? -- ;; -- *.gz) -- gunzip -c old/$file > old/${file/.gz/} -- gunzip -c new/$file > new/${file/.gz/} -- check_single_file ${file/.gz/} -- return $? -- ;; -- *.rpm) -- $self_script -a old/$file new/$file -- return $? -- ;; -- *png) -- # Try to remove timestamps, only if convert from ImageMagick is installed -- if [[ $(type -p convert) ]]; then -- convert old/$file +set date:create +set date:modify old/${file/.png/_n.png} -- convert old/$file +set date:create +set date:modify new/${file/.png/_n.png} -- if ! cmp -s old/${file/.png/_n.png} new/${file/.png/_n.png}; then -- echo "$file differs ($ftype)" -- hexdump -C old/${file/.png/_n.png} > $file1 -- hexdump -C new/${file/.png/_n.png} > $file2 -- diff -u $file1 $file2 | head -n 20 -- return 1 -- fi -- return 0 -- fi -- ;; -- /usr/share/locale/*/LC_MESSAGES/*.mo|/usr/share/locale-bundle/*/LC_MESSAGES/*.mo) -- for f in old/$file new/$file; do -- sed -i -e "s,POT-Creation-Date: ....-..-.. ..:..+....,POT-Creation-Date: 1970-01-01 00:00+0000," $f -- done -- ;; -- /usr/share/doc/packages/*/*.html|\ -- /usr/share/doc/kde/HTML/*/*/*.html|/usr/share/doc/*/html/*.html) -- for f in old/$file new/$file; do -- # texi2html output, e.g. in kvm, indent, qemu -- sed -i -e "s|^<!-- Created on .*, 20.. by texi2html .\...|<!-- Created on August 7, 2009 by texi2html 1.82|" $f -- sed -i -e 's|^ *This document was generated by <em>Autobuild</em> on <em>.*, 20..</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html .\...</em></a>.$| This document was generated by <em>Autobuild</em> on <em>August 7, 2009</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.82</em></a>.|' $f -- # doxygen docu, e.g. in libssh and log4c -- sed -i -e 's|Generated on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] 20[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f -- # Generated on Sat Aug 14 2010 16:49:48 for libssh -- sed -i -e 's|Generated on ... ... [0-9]* 20[0-9][0-9] [0-9]*:[0-9][0-9]:[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f -- done -- strip_numbered_anchors -- ;; -- /usr/share/javadoc/*.html |\ -- /usr/share/javadoc/*/*.html|/usr/share/javadoc/*/*/*.html) -- strip_numbered_anchors -- # There are more timestamps in html, so far we handle only some primitive versions. -- for f in old/$file new/$file; do -- # Javadoc: -- # <head> -- # <!-- Generated by javadoc (version 1.7.0_75) on Tue Feb 03 02:20:12 GMT 2015 --> -- # <!-- Generated by javadoc on Tue Feb 03 00:02:48 GMT 2015 --> -- # <meta name="date" content="2015-02-03"> -- # </head> -- sed -i -e ' -- /^<head>/{ -- : next -- n -- /^<\/head>/{ -- b end_head -- } -- s/^\(<!-- Generated by javadoc\) \((\(build\|version\) [0-9._]\+) on ... ... .. ..:..:.. \(GMT\|UTC\) ....\) \(-->\)/\1 some-date-removed-by-build-compare \5/ -- t next -- s/^\(<!-- Generated by javadoc\) \(on ... ... .. ..:..:.. \(GMT\|UTC\) ....\) \(-->\)/\1 some-date-removed-by-build-compare \3/ -- t next -- s/^<meta name="date" content="[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}">/<meta name="date" content="some-date-removed-by-build-compare">/ -- b next -- } -- : end_head -- ' $f -- # Gjdoc HtmlDoclet: -- sed -i -e 's%Generated by Gjdoc HtmlDoclet [0-9,.]*, part of <a href="http://www.gnu.org/software/classpath/cp-tools/" title="" target="_top">GNU Classpath Tools</a>, on .*, 20.. [0-9]*:..:.. \(a\|p\)\.m\. GMT.%Generated by Gjdoc.%' $f -- sed -i -e 's%<!DOCTYPE html PUBLIC "-//gnu.org///DTD XHTML 1.1 plus Target 1.0//EN"\(.*\)GNU Classpath Tools</a>, on [A-Z][a-z]* [0-9]*, 20?? [0-9]*:??:?? \(a|p\)\.m\. GMT.</p>%<!DOCTYPE html PUBLIC "-//gnu.org///DTD XHTML 1.1 plus Target 1.0//EN"\1GNU Classpath Tools</a>, on January 1, 2009 0:00:00 a.m. GMT.</p>%' $f -- sed -i -e 's%<!DOCTYPE html PUBLIC "-//gnu.org///DTD\(.*GNU Classpath Tools</a>\), on [a-zA-Z]* [0-9][0-9], 20.. [0-9]*:..:.. \(a\|p\)\.m\. GMT.</p>%<!DOCTYPE html PUBLIC "-//gnu.org///DTD\1,on May 1, 2010 1:11:42 p.m. GMT.</p>%' $f -- # deprecated-list is randomly ordered, sort it for comparison -- case $f in -- */deprecated-list.html) -- sort -o $f $f -- ;; -- esac -- done -- ;; -- /usr/share/javadoc/gjdoc.properties |\ -- /usr/share/javadoc/*/gjdoc.properties) -- for f in old/$file new/$file; do -- sed -i -e 's|^#[A-Z][a-z]\{2\} [A-Z][a-z]\{2\} [0-9]\{2\} ..:..:.. GMT 20..$|#Fri Jan 01 11:27:36 GMT 2009|' $f -- done -- ;; -- */fonts.scale|*/fonts.dir|*/encodings.dir) -- for f in old/$file new/$file; do -- # sort files before comparing -- sort -o $f $f -- done -- ;; -- /var/adm/perl-modules/*) -- for f in old/$file new/$file; do -- sed -i -e 's|^=head2 ... ... .. ..:..:.. ....: C<Module>|=head2 Wed Jul 1 00:00:00 2009: C<Module>|' $f -- done -- ;; -- /usr/share/man/man3/*3pm) -- for f in old/$file new/$file; do -- sed -i -e 's| 3 "20..-..-.." "perl v5....." "User Contributed Perl Documentation"$| 3 "2009-01-01" "perl v5.10.0" "User Contributed Perl Documentation"|' $f -- trim_man_TH $f -- trim_man_first_line $f -- done -- ;; -- /usr/share/man/*/man*|/usr/share/man/man*|/usr/lib/texmf/doc/man/*/*) -- -- for f in old/$file new/$file; do -- trim_man_TH $f -- trim_man_first_line $f -- # generated by docbook xml: -- #.\" Date: 09/13/2010 -- sed -i -e 's|Date: [0-1][0-9]/[0-9][0-9]/201[0-9]|Date: 09/13/2010|' $f -- done -- ;; -- *.elc) -- # emacs lisp files -- for f in old/$file new/$file; do -- sed -i -e 's|Compiled by abuild@.* on ... ... .. ..:..:.. 20..$|compiled by abuild@buildhost on Wed Jul 01 00:00:00 2009|' $f -- done -- ;; -- /var/lib/texmf/web2c/*/*fmt |\ -- /var/lib/texmf/web2c/metafont/*.base|\ -- /var/lib/texmf/web2c/metapost/*.mem) -- # binary dump of TeX and Metafont formats, we can ignore them for good -- echo "difference in $file ignored." -- return 0 -- ;; -- */libtool) -- for f in old/$file new/$file; do -- sed -i -e 's|^# Libtool was configured on host [A-Za-z0-9]*:$|# Libtool was configured on host x42:|' $f -- done -- ;; -- /etc/mail/*cf|/etc/sendmail.cf) -- # from sendmail package -- for f in old/$file new/$file; do -- # - ##### built by abuild@build33 on Thu May 6 11:21:17 UTC 2010 -- sed -i -e 's|built by abuild@[a-z0-9]* on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] .* 20[0-9][0-9]|built by abuild@build42 on Thu May 6 11:21:17 UTC 2010|' $f -- done -- ;; -- /usr/share/doc/kde/HTML/*/*/index.cache|/usr/share/doc/kde/HTML/*/*/*/index.cache|\ -- /usr/share/gtk-doc/html/*/*.html|/usr/share/gtk-doc/html/*/*.devhelp2) -- # various kde and gtk packages -- strip_numbered_anchors -- ;; -- */created.rid) -- # ruby documentation -- # file just contains a timestamp and nothing else, so ignore it -- echo "Ignore $file" -- return 0 -- ;; -- */rdoc/files/*.html) -- # ruby documentation -- # <td>Mon Sep 20 19:02:43 +0000 2010</td> -- for f in old/$file new/$file; do -- sed -i -e 's%<td>[A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]\+ [0-9]\+:[0-9]\+:[0-9]\+ +0000 201[0-9]</td>%<td>Mon Sep 20 19:02:43 +0000 2010</td>%g' $f -- done -- strip_numbered_anchors -- ;; -- */Linux*Env.Set.sh) -- # LibreOffice files, contains: -- # Generated on: Mon Apr 18 13:19:22 UTC 2011 -- for f in old/$file new/$file; do -- sed -i -e 's%^# Generated on:.*UTC 201[0-9] *$%# Generated on: Sometime%g' $f -- done -- ;; -- /usr/lib/libreoffice/solver/inc/*/deliver.log) -- # LibreOffice log file -- echo "Ignore $file" -- return 0 -- ;; -- /var/adm/update-messages/*|/var/adm/update-scripts/*) -- # encode version-release inside -- oldfn=`echo "$file"|sed -e s/-$release2/-$release1/;` -- -- # fetchmsttfonts embeds the release number in the update shell script. -- echo sed -i -e "s/-$release1/-$release2/g;" "old/$oldfn" -- sed -i -e "s/-$release1/-$release2/g;" "old/$oldfn" -- -- if ! diff -u old/$oldfn new/$file; then -- echo "$oldfn is not same as $file" -- return 1 -- fi -- echo "$file and $oldfn are same" -- return 0 -- ;; -- *.ps) -- for f in "old/$file" "new/$file"; do -- sed -i -e ' -- /^%%CreationDate:[[:blank:]]/d -- /^%%Creator:[[:blank:]]groff[[:blank:]]version[[:blank:]]/d -- ' "$f" -- done -- ;; -- *pdf) -- # PDF files contain a unique ID, remove it -- # Format of the ID is: -- # /ID [<9ACE247A70CF9BEAFEE15E116259BD6D> <9ACE247A70CF9BEAFEE15E116259BD6D>] -- # with optional spaces. pdftex creates also: -- # /CreationDate (D:20120103083206Z) -- # /ModDate (D:20120103083206Z) -- # and possibly XML metadata as well -- for f in "old/$file" "new/$file"; do -- sed -i \ -- '/obj/,/endobj/{ -- s%/ID \?\[ \?<[^>]\+> \?<[^>]\+> \?\]%/IDrandom%g; -- s%/CreationDate \?(D:[^)]*)%/CreationDate (D: XXX)%g; -- s%/ModDate \?(D:[^)]*)%/ModDate (D: XXX)%g; -- s%<pdf:CreationDate>[^<]*</pdf:CreationDate>%<pdf:CreationDate>XXX</pdf:CreationDate>%g; -- s%<pdf:ModDate>[^<]*</pdf:ModDate>%<pdf:ModDate>XXX</pdf:ModDate>%g; -- s%<xap:CreateDate>[^<]*</xap:CreateDate>%<xap:CreateDate>XXX</xap:CreateDate>%g; -- s%<xap:ModifyDate>[^<]*</xap:ModifyDate>%<xap:ModifyDate>XXX</xap:ModifyDate>%g; -- s%<xap:MetadataDate>[^<]*</xap:MetadataDate>%<xap:MetadataDate>XXX</xap:MetadataDate>%g; -- }' "$f" -- done -- ;; -- esac -- -- ftype=`/usr/bin/file old/$file | sed 's@^[^:]\+:[[:blank:]]*@@'` -- case $ftype in -- PE32\ executable*Mono\/\.Net\ assembly*) -- echo "PE32 Mono/.Net assembly: $file" -- if [ -x /usr/bin/monodis ] ; then -- monodis old/$file 2>/dev/null|sed -e 's/GUID = {.*}/GUID = { 42 }/;'> ${file1} -- monodis new/$file 2>/dev/null|sed -e 's/GUID = {.*}/GUID = { 42 }/;'> ${file2} -- if ! cmp -s ${file1} ${file2}; then -- echo "$file differs ($ftype)" -- diff -u ${file1} ${file2} -- return 1 -- fi -- else -- echo "Cannot compare, no monodis installed" -- return 1 -- fi -- ;; -- ELF*executable*|ELF*[LM]SB\ shared\ object*) -- objdump -d --no-show-raw-insn old/$file | filter_disasm > $file1 -- if ! test -s $file1; then -- # objdump has no idea how to handle it -- if ! diff_two_files; then -- ret=1 -- break -- fi -- fi -- elfdiff= -- sed -i -e "s,old/,," $file1 -- objdump -d --no-show-raw-insn new/$file | filter_disasm > $file2 -- sed -i -e "s,new/,," $file2 -- if ! diff -u $file1 $file2 > $dfile; then -- echo "$file differs in assembler output" -- head -n 200 $dfile -- elfdiff="1" -- fi -- echo "" >$file1 -- echo "" >$file2 -- # Don't compare .build-id and .gnu_debuglink sections -- sections="$(objdump -s new/$file | grep "Contents of section .*:" | sed -r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" | tr "\n" " ")" -- for section in $sections; do -- objdump -s -j $section old/$file | sed "s,^old/,," > $file1 -- objdump -s -j $section new/$file | sed "s,^new/,," > $file2 -- if ! diff -u $file1 $file2 > $dfile; then -- echo "$file differs in ELF section $section" -- head -n 200 $dfile -- elfdiff="1" -- fi -- done -- if test -z "$elfdiff"; then -- echo "$file: only difference was in build-id or gnu_debuglink, GOOD." -- return 0 -- fi -- return 1 -- ;; -- *ASCII*|*text*) -- if ! cmp -s old/$file new/$file; then -- echo "$file differs ($ftype)" -- diff -u old/$file new/$file | head -n 200 -- return 1 -- fi -- ;; -- directory|setuid,\ directory|sticky,\ directory) -- # tar might package directories - ignore them here -- return 0 -- ;; -- bzip2\ compressed\ data*) -- if ! check_compressed_file "$file" "bz2"; then -- return 1 -- fi -- ;; -- gzip\ compressed\ data*) -- if ! check_compressed_file "$file" "gzip"; then -- return 1 -- fi -- ;; -- XZ\ compressed\ data*) -- if ! check_compressed_file "$file" "xz"; then -- return 1 -- fi -- ;; -- POSIX\ tar\ archive) -- mv old/$file{,.tar} -- mv new/$file{,.tar} -- if ! check_single_file ${file}.tar; then -- return 1 -- fi -- ;; -- cpio\ archive) -- mv old/$file{,.cpio} -- mv new/$file{,.cpio} -- if ! check_single_file ${file}.cpio; then -- return 1 -- fi -- ;; -- symbolic\ link\ to\ *) -- readlink "old/$file" > $file1 -- readlink "new/$file" > $file2 -- if ! diff -u $file1 $file2; then -- echo "symlink target for $file differs" -- return 1 -- fi -- ;; -- *) -- if ! diff_two_files; then -- return 1 -- fi -- ;; -- esac -- return 0 --} -- --# We need /proc mounted for some tests, so check that it's mounted and --# complain if not. --PROC_MOUNTED=0 --if [ ! -d /proc/self/ ]; then -- echo "/proc is not mounted" -- mount -orw -n -tproc none /proc -- PROC_MOUNTED=1 --fi -- --# preserve cmp_spec result for check_all runs --ret=$RES --for file in $files; do -- if ! check_single_file $file; then -- ret=1 -- if test -z "$check_all"; then -- break -- fi -- fi --done -- --if [ "$PROC_MOUNTED" -eq "1" ]; then -- echo "Unmounting proc" -- umount /proc --fi -- --rm $file1 $file2 $dfile $rename_script --rm -rf $dir --if test "$ret" = 0; then -- echo "Package content is identical" --fi --exit $ret --# vim: tw=666 ts=2 et -diff --git a/same-build-result.sh b/same-build-result.sh -index c8907e2..7e9bd4f 100644 ---- a/same-build-result.sh -+++ b/same-build-result.sh -@@ -7,11 +7,11 @@ - # Enhanced by Andreas Jaeger <aj@suse.de> - # - # The script decides if the new build differes from the former one, --# using rpm-check.sh. -+# using pkg-diff.sh. - # The script is called as part of the build process as: - # /usr/lib/build/same-build-result.sh /.build.oldpackages /usr/src/packages/RPMS /usr/src/packages/SRPMS - --CMPSCRIPT=${0%/*}/rpm-check.sh -+CMPSCRIPT=${0%/*}/pkg-diff.sh - SCMPSCRIPT=${0%/*}/srpm-check.sh - - check_all=1 --- -1.7.9.5 - diff --git a/poky/meta/recipes-devtools/build-compare/files/functions.sh-improve-deb-and-ipk-checking.patch b/poky/meta/recipes-devtools/build-compare/files/functions.sh-improve-deb-and-ipk-checking.patch deleted file mode 100644 index 05420f89f..000000000 --- a/poky/meta/recipes-devtools/build-compare/files/functions.sh-improve-deb-and-ipk-checking.patch +++ /dev/null @@ -1,117 +0,0 @@ -From b4eb7fde10318162bd2d02b9017ef51746752a91 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Thu, 14 Jul 2016 23:14:21 -0700 -Subject: [PATCH 4/4] functions.sh: improve deb and ipk checking - -* The deb and ipk's depends version string is like: - Depends: libc6 (>= 2.24) - Update trim_release_old and trim_release_new to match the bracket in - the end ")". - -* The deb's data tarball now is .tar.xz, and ipk's is .tar.gz. - -* Update adjust_controlfile() to make ituse trim_release_old and - trim_release_new. - -Upstream-Status: Submitted [https://github.com/openSUSE/build-compare/pull/10] - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - functions.sh | 45 ++++++++++++++++++++++++++++----------------- - 1 file changed, 28 insertions(+), 17 deletions(-) - -diff --git a/functions.sh b/functions.sh -index aa572f9..fe493ba 100755 ---- a/functions.sh -+++ b/functions.sh -@@ -78,7 +78,7 @@ check_header() - function trim_release_old() - { - sed -e " -- /\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_old_regex_l\$\)/{s,$version_release_old_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_old_regex_s,@VERSION@-@RELEASE_SHORT@,g} -+ /\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_old_regex_l\$\|$version_release_old_regex_l)\)/{s,$version_release_old_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_old_regex_s,@VERSION@-@RELEASE_SHORT@,g} - s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_old_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g - s/^ *//g - " -@@ -86,7 +86,7 @@ function trim_release_old() - function trim_release_new() - { - sed -e " -- /\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_new_regex_l\$\)/{s,$version_release_new_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_new_regex_s,@VERSION@-@RELEASE_SHORT@,g} -+ /\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_new_regex_l\$\|$version_release_new_regex_l)\)/{s,$version_release_new_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_new_regex_s,@VERSION@-@RELEASE_SHORT@,g} - s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_new_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g - s/^ *//g - " -@@ -133,8 +133,8 @@ function unpackage() - ar x $file - tar xf control.tar.gz - rm control.tar.gz -- tar xf data.tar.gz -- rm data.tar.gz -+ tar xf data.tar.[xg]z -+ rm data.tar.[xg]z - ;; - esac - popd 1>/dev/null -@@ -164,6 +164,22 @@ function get_value() - sed -n -e "/^___${1}___/,/^___${1}___/p" $2 | sed -e "/^___${1}___/d" - } - -+# Set version_release_old_regex_s, version_release_old_regex_l and -+# name_ver_rel_old_regex_l, also the new ones. -+function set_regex() { -+ # Remember to quote the . which is in release -+ # Short version without B_CN -+ version_release_old_regex_s=${version_release_old%.*} -+ version_release_old_regex_s=${version_release_old_regex_s//./\\.} -+ version_release_new_regex_s=${version_release_new%.*} -+ version_release_new_regex_s=${version_release_new_regex_s//./\\.} -+ # Long version with B_CNT -+ version_release_old_regex_l=${version_release_old//./\\.} -+ version_release_new_regex_l=${version_release_new//./\\.} -+ name_ver_rel_old_regex_l=${name_ver_rel_old//./\\.} -+ name_ver_rel_new_regex_l=${name_ver_rel_new//./\\.} -+} -+ - # Compare just the rpm meta data of two rpms - # Returns: - # 0 in case of same content -@@ -194,17 +210,7 @@ function cmp_spec () - version_release_old="$(get_value QF_VER_REL $spec_old)" - name_ver_rel_old="$(get_value QF_NAME_VER_REL $spec_old)" - -- # Remember to quote the . which is in release -- # Short version without B_CN -- version_release_old_regex_s=${version_release_old%.*} -- version_release_old_regex_s=${version_release_old_regex_s//./\\.} -- version_release_new_regex_s=${version_release_new%.*} -- version_release_new_regex_s=${version_release_new_regex_s//./\\.} -- # Long version with B_CNT -- version_release_old_regex_l=${version_release_old//./\\.} -- version_release_new_regex_l=${version_release_new//./\\.} -- name_ver_rel_old_regex_l=${name_ver_rel_old//./\\.} -- name_ver_rel_new_regex_l=${name_ver_rel_new//./\\.} -+ set_regex - - # Check the whole spec file at first, return 0 immediately if the - # are the same. -@@ -285,9 +291,14 @@ function cmp_spec () - } - - function adjust_controlfile() { -- cat $1/control | sed '/^Version: /d' > $1/control.fixed -+ version_release_old="`sed -ne 's/^Version: \(.*\)/\1/p' $1/control`" -+ name_ver_rel_old="`sed -n -e 's/^Package: \(.*\)/\1/p' $1/control`-`sed -n -e 's/^Version: \(.*\)/\1/p' $1/control`" -+ version_release_new="`sed -ne 's/^Version: \(.*\)/\1/p' $2/control`" -+ name_ver_rel_new="`sed -n -e 's/^Package: \(.*\)/\1/p' $2/control`-`sed -n -e 's/^Version: \(.*\)/\1/p' $2/control`" -+ set_regex -+ cat $1/control | trim_release_old > $1/control.fixed - mv $1/control.fixed $1/control -- cat $2/control | sed '/^Version: /d' > $2/control.fixed -+ cat $2/control | trim_release_new > $2/control.fixed - mv $2/control.fixed $2/control - } - --- -2.9.0 - diff --git a/poky/meta/recipes-devtools/build-compare/files/functions.sh-remove-space-at-head.patch b/poky/meta/recipes-devtools/build-compare/files/functions.sh-remove-space-at-head.patch deleted file mode 100644 index 02e96bab5..000000000 --- a/poky/meta/recipes-devtools/build-compare/files/functions.sh-remove-space-at-head.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 402a821e604f280e62c34bf4d40c6d1b4c6c892d Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Mon, 4 Jul 2016 20:11:33 -0700 -Subject: [PATCH] functions.sh: remove space at head - -The command like: -rpm -qp --nodigest --nosignature --qf '<foo> [%{REQUIRENAME}\n]\n' - ^^space - -The space will be printed, and will impact the check result, so remove it. - -Upstream-Status: Submitted [https://github.com/openSUSE/build-compare/pull/9] - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - functions.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/functions.sh b/functions.sh -index 85c9003..b1069d2 100644 ---- a/functions.sh -+++ b/functions.sh -@@ -26,6 +26,7 @@ function trim_release_old() - sed -e " - /\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_old_regex_l\$\)/{s,$version_release_old_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_old_regex_s,@VERSION@-@RELEASE_SHORT@,g} - s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_old_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g -+ s/^ *//g - " - } - function trim_release_new() -@@ -33,6 +34,7 @@ function trim_release_new() - sed -e " - /\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_new_regex_l\$\)/{s,$version_release_new_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_new_regex_s,@VERSION@-@RELEASE_SHORT@,g} - s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_new_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g -+ s/^ *//g - " - } - # Get single directory or filename with long or short release string --- -2.9.0 - diff --git a/poky/meta/recipes-devtools/build-compare/files/functions.sh-run-rpm-once-to-make-it-faster.patch b/poky/meta/recipes-devtools/build-compare/files/functions.sh-run-rpm-once-to-make-it-faster.patch deleted file mode 100644 index f5b99d944..000000000 --- a/poky/meta/recipes-devtools/build-compare/files/functions.sh-run-rpm-once-to-make-it-faster.patch +++ /dev/null @@ -1,361 +0,0 @@ -From f34d632c427b1e1570ef9136454fc01d8c9f10a6 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Thu, 7 Jul 2016 19:34:09 -0700 -Subject: [PATCH] functions.sh: run rpm once to make it faster - -The rpm tool is a heavy process, it ran 16 (or 17 for kernel) -"rpm -qp" times when the pkgs are identical, now we only run -"rpm -qp --qf <all we need>" twice (one is for old pkg, and one is for -new), save the results to spec_old and spec_new, then use sed command to -get what we need later, this can make it 75% faster when the pkgs are -identical. Here is the rough data on my host Ubuntu 14.04.4, 32 cores -CPU and 128G mem: -* When the pkgs are identical: - - Before the patch: 1s - - After the patch: 0.26s - I compare the whole spec firstly, and return 0 if they are the same, - or go on checking one by one if not, without this, it would be 0.46s, - the gain is great when there are lot of packages, usually, we have - more than 10,000 rpms to compare. - -* When the pkgs are different: - That depends on where is the different, if the different is at the - comparing rpmtags stage: - - Before the patch: 0.26s - - After the patch: 0.29s - Increased 0.03s, but if the different is happend later than comparing - rpmtags, it will save time. - -Upstream-Status: Submitted [https://github.com/openSUSE/build-compare/pull/9] - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - functions.sh | 245 ++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 132 insertions(+), 113 deletions(-) - mode change 100644 => 100755 functions.sh - -diff --git a/functions.sh b/functions.sh -old mode 100644 -new mode 100755 -index b1069d2..aa572f9 ---- a/functions.sh -+++ b/functions.sh -@@ -10,9 +10,63 @@ - - RPM="rpm -qp --nodigest --nosignature" - --check_header() -+# Name, Version, Release -+QF_NAME="%{NAME}" -+QF_VER_REL="%{VERSION}-%{RELEASE}" -+QF_NAME_VER_REL="%{NAME}-%{VERSION}-%{RELEASE}" -+ -+# provides destroy this because at least the self-provide includes the -+# -buildnumber :-( -+QF_PROVIDES="[%{PROVIDENAME} %{PROVIDEFLAGS} %{PROVIDEVERSION}\\n]\\n" -+QF_PROVIDES="$QF_PROVIDES [%{REQUIRENAME} %{REQUIREFLAGS} %{REQUIREVERSION}\\n]\\n" -+QF_PROVIDES="$QF_PROVIDES [%{CONFLICTNAME} %{CONFLICTFLAGS} %{CONFLICTVERSION}\\n]\\n" -+QF_PROVIDES="$QF_PROVIDES [%{OBSOLETENAME} %{OBSOLETEFLAGS} %{OBSOLETEVERSION}\\n]\\n" -+ -+# don't look at RELEASE, it contains our build number -+QF_TAGS="%{NAME} %{VERSION} %{EPOCH}\\n" -+QF_TAGS="$QF_TAGS %{SUMMARY}\\n%{DESCRIPTION}\\n" -+# the DISTURL tag can be used as checkin ID -+QF_TAGS="$QF_TAGS %{VENDOR} %{DISTRIBUTION} %{DISTURL}" -+QF_TAGS="$QF_TAGS %{LICENSE} %{LICENSE}\\n" -+QF_TAGS="$QF_TAGS %{GROUP} %{URL} %{EXCLUDEARCH} %{EXCLUDEOS} %{EXCLUSIVEARCH}\\n" -+QF_TAGS="$QF_TAGS %{EXCLUSIVEOS} %{RPMVERSION} %{PLATFORM}\\n" -+QF_TAGS="$QF_TAGS %{PAYLOADFORMAT} %{PAYLOADCOMPRESSOR} %{PAYLOADFLAGS}\\n" -+ -+# XXX We also need to check the existence (but not the content (!)) -+# of SIGGPG (and perhaps the other SIG*) -+# XXX We don't look at triggers -+QF_TAGS="$QF_TAGS [%{VERIFYSCRIPTPROG} %{VERIFYSCRIPT}]\\n" -+# Only the first ChangeLog entry; should be enough -+QF_TAGS="$QF_TAGS %{CHANGELOGTIME} %{CHANGELOGNAME} %{CHANGELOGTEXT}\\n" -+ -+# scripts, might contain release number -+QF_SCRIPT="[%{PREINPROG} %{PREIN}\\n]\\n[%{POSTINPROG} %{POSTIN}\\n]\\n[%{PREUNPROG} %{PREUN}\\n]\\n[%{POSTUNPROG} %{POSTUN}\\n]\\n" -+ -+# Now the files. We leave out mtime and size. For normal files -+# the size will influence the MD5 anyway. For directories the sizes can -+# differ, depending on which file system the package was built. To not -+# have to filter out directories we simply ignore all sizes. -+# Also leave out FILEDEVICES, FILEINODES (depends on the build host), -+# FILECOLORS, FILECLASS (normally useful but file output contains mtimes), -+# FILEDEPENDSX and FILEDEPENDSN. -+# Also FILELANGS (or?) -+QF_FILELIST="[%{FILENAMES} %{FILEFLAGS} %{FILESTATES} %{FILEMODES:octal} %{FILEUSERNAME} %{FILEGROUPNAME} %{FILERDEVS} %{FILEVERIFYFLAGS} %{FILELINKTOS}\n]\\n" -+# ??? what to do with FILEPROVIDE and FILEREQUIRE? -+ -+QF_CHECKSUM="[%{FILENAMES} %{FILEMD5S} %{FILEFLAGS}\n]\\n" -+ -+QF_ALL="\n___QF_NAME___\n${QF_NAME}\n___QF_NAME___\n" -+QF_ALL="$QF_ALL\n___QF_TAGS___\n${QF_TAGS}\n___QF_TAGS___\n" -+QF_ALL="$QF_ALL\n___QF_VER_REL___\n${QF_VER_REL}\n___QF_VER_REL___\n" -+QF_ALL="$QF_ALL\n___QF_NAME_VER_REL___\n${QF_NAME_VER_REL}\n___QF_NAME_VER_REL___\n" -+QF_ALL="$QF_ALL\n___QF_PROVIDES___\n${QF_PROVIDES}\n___QF_PROVIDES___\n" -+QF_ALL="$QF_ALL\n___QF_SCRIPT___\n${QF_SCRIPT}\n___QF_SCRIPT___\n" -+QF_ALL="$QF_ALL\n___QF_FILELIST___\n${QF_FILELIST}\n___QF_FILELIST___\n" -+QF_ALL="$QF_ALL\n___QF_CHECKSUM___\n${QF_CHECKSUM}\n___QF_CHECKSUM___\n" -+ -+check_header() - { -- $RPM --qf "$QF" "$1" -+ $RPM --qf "$1" "$2" - } - - # Trim version-release string: -@@ -47,18 +101,6 @@ function grep_release_new() - grep -E "(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]+(${version_release_new_regex_l}(\$|[^/]+\$)|${version_release_new_regex_s}(\$|[^/]+\$))" - } - --function check_provides() --{ -- local pkg=$1 -- # provides destroy this because at least the self-provide includes the -- # -buildnumber :-( -- QF="[%{PROVIDENAME} %{PROVIDEFLAGS} %{PROVIDEVERSION}\\n]\\n" -- QF="$QF [%{REQUIRENAME} %{REQUIREFLAGS} %{REQUIREVERSION}\\n]\\n" -- QF="$QF [%{CONFLICTNAME} %{CONFLICTFLAGS} %{CONFLICTVERSION}\\n]\\n" -- QF="$QF [%{OBSOLETENAME} %{OBSOLETEFLAGS} %{OBSOLETEVERSION}\\n]\\n" -- check_header "$pkg" --} -- - #usage unpackage <file> $dir - # Unpack files in directory $dir - # like /usr/bin/unpackage - just for one file and with no options -@@ -98,6 +140,30 @@ function unpackage() - popd 1>/dev/null - } - -+# Run diff command on the files -+# $1: printed info -+# $2: file1 -+# $3: file2 -+function comp_file() -+{ -+ echo "comparing $1" -+ if ! diff -au $2 $3; then -+ if test -z "$check_all"; then -+ rm $2 $3 $spec_old $spec_new -+ return 1 -+ fi -+ fi -+ return 0 -+} -+ -+# Get var's value from specfile. -+# $1: var name -+# $2: specfile -+function get_value() -+{ -+ sed -n -e "/^___${1}___/,/^___${1}___/p" $2 | sed -e "/^___${1}___/d" -+} -+ - # Compare just the rpm meta data of two rpms - # Returns: - # 0 in case of same content -@@ -107,56 +173,29 @@ function unpackage() - function cmp_spec () - { - local RES -- local file1 file2 -+ local file_old file_new - local f - local sh=$1 - local oldrpm=$2 - local newrpm=$3 - -- QF="%{NAME}" -- -- # don't look at RELEASE, it contains our build number -- QF="$QF %{VERSION} %{EPOCH}\\n" -- QF="$QF %{SUMMARY}\\n%{DESCRIPTION}\\n" -- QF="$QF %{VENDOR} %{DISTRIBUTION} %{DISTURL}" -- QF="$QF %{LICENSE} %{LICENSE}\\n" -- QF="$QF %{GROUP} %{URL} %{EXCLUDEARCH} %{EXCLUDEOS} %{EXCLUSIVEARCH}\\n" -- QF="$QF %{EXCLUSIVEOS} %{RPMVERSION} %{PLATFORM}\\n" -- QF="$QF %{PAYLOADFORMAT} %{PAYLOADCOMPRESSOR} %{PAYLOADFLAGS}\\n" -- -- -- # XXX We also need to check the existence (but not the content (!)) -- # of SIGGPG (and perhaps the other SIG*) -- -- # XXX We don't look at triggers -- -- QF="$QF [%{VERIFYSCRIPTPROG} %{VERIFYSCRIPT}]\\n" -- -- # Only the first ChangeLog entry; should be enough -- QF="$QF %{CHANGELOGTIME} %{CHANGELOGNAME} %{CHANGELOGTEXT}\\n" -- -- file1=`mktemp` -- file2=`mktemp` -- -- check_header $oldrpm > $file1 -- check_header $newrpm > $file2 -- -- # the DISTURL tag can be used as checkin ID -- #echo "$QF" -- echo "comparing rpmtags" -- if ! diff -au $file1 $file2; then -- if test -z "$check_all"; then -- rm $file1 $file2 -- return 1 -- fi -- fi -- -+ file_old=`mktemp` -+ file_new=`mktemp` -+ spec_old=`mktemp` -+ spec_new=`mktemp` -+ -+ check_header "$QF_ALL" $oldrpm > $spec_old -+ check_header "$QF_ALL" $newrpm > $spec_new -+ -+ name_new="$(get_value QF_NAME $spec_new)" -+ version_release_new="$(get_value QF_VER_REL $spec_new)" -+ name_ver_rel_new="$(get_value QF_NAME_VER_REL $spec_new)" -+ -+ version_release_old="$(get_value QF_VER_REL $spec_old)" -+ name_ver_rel_old="$(get_value QF_NAME_VER_REL $spec_old)" -+ - # Remember to quote the . which is in release -- version_release_old=$($RPM --qf "%{VERSION}-%{RELEASE}" "$oldrpm") -- version_release_new=$($RPM --qf "%{VERSION}-%{RELEASE}" "$newrpm") -- name_ver_rel_old=$($RPM --qf "%{NAME}-%{VERSION}-%{RELEASE}" "$oldrpm") -- name_ver_rel_new=$($RPM --qf "%{NAME}-%{VERSION}-%{RELEASE}" "$newrpm") -- # Short version without B_CNT -+ # Short version without B_CN - version_release_old_regex_s=${version_release_old%.*} - version_release_old_regex_s=${version_release_old_regex_s//./\\.} - version_release_new_regex_s=${version_release_new%.*} -@@ -166,10 +205,27 @@ function cmp_spec () - version_release_new_regex_l=${version_release_new//./\\.} - name_ver_rel_old_regex_l=${name_ver_rel_old//./\\.} - name_ver_rel_new_regex_l=${name_ver_rel_new//./\\.} -+ -+ # Check the whole spec file at first, return 0 immediately if the -+ # are the same. -+ cat $spec_old | trim_release_old > $file_old -+ cat $spec_new | trim_release_new > $file_new -+ echo "comparing the whole specfile" -+ if diff -au $spec_old $spec_new; then -+ if test -z "$check_all"; then -+ rm $file_old $file_new $spec_old $spec_new -+ return 0 -+ fi -+ fi -+ -+ get_value QF_TAGS $spec_old > $file_old -+ get_value QF_TAGS $spec_new > $file_new -+ comp_file rpmtags $file_old $file_new || return 1 -+ - # This might happen when?! - echo "comparing RELEASE" - if [ "${version_release_old%.*}" != "${version_release_new%.*}" ] ; then -- case $($RPM --qf '%{NAME}' "$newrpm") in -+ case $name_new in - kernel-*) - # Make sure all kernel packages have the same %RELEASE - echo "release prefix mismatch" -@@ -181,71 +237,34 @@ function cmp_spec () - *) ;; - esac - fi -- -- check_provides $oldrpm | trim_release_old | sort > $file1 -- check_provides $newrpm | trim_release_new | sort > $file2 -- -- echo "comparing PROVIDES" -- if ! diff -au $file1 $file2; then -- if test -z "$check_all"; then -- rm $file1 $file2 -- return 1 -- fi -- fi - -- # scripts, might contain release number -- QF="[%{PREINPROG} %{PREIN}\\n]\\n[%{POSTINPROG} %{POSTIN}\\n]\\n[%{PREUNPROG} %{PREUN}\\n]\\n[%{POSTUNPROG} %{POSTUN}\\n]\\n" -- check_header $oldrpm | trim_release_old > $file1 -- check_header $newrpm | trim_release_new > $file2 -+ get_value QF_PROVIDES $spec_old | trim_release_old | sort > $file_old -+ get_value QF_PROVIDES $spec_new | trim_release_new | sort > $file_new -+ comp_file PROVIDES $file_old $file_new || return 1 -+ -+ get_value QF_SCRIPT $spec_old | trim_release_old > $file_old -+ get_value QF_SCRIPT $spec_new | trim_release_new > $file_new -+ comp_file scripts $file_old $file_new || return 1 - -- echo "comparing scripts" -- if ! diff -au $file1 $file2; then -- if test -z "$check_all"; then -- rm $file1 $file2 -- return 1 -- fi -- fi -- - # First check the file attributes and later the md5s -- -- # Now the files. We leave out mtime and size. For normal files -- # the size will influence the MD5 anyway. For directories the sizes can -- # differ, depending on which file system the package was built. To not -- # have to filter out directories we simply ignore all sizes. -- # Also leave out FILEDEVICES, FILEINODES (depends on the build host), -- # FILECOLORS, FILECLASS (normally useful but file output contains mtimes), -- # FILEDEPENDSX and FILEDEPENDSN. -- # Also FILELANGS (or?) -- QF="[%{FILENAMES} %{FILEFLAGS} %{FILESTATES} %{FILEMODES:octal} %{FILEUSERNAME} %{FILEGROUPNAME} %{FILERDEVS} %{FILEVERIFYFLAGS} %{FILELINKTOS}\n]\\n" -- # ??? what to do with FILEPROVIDE and FILEREQUIRE? -- -- check_header $oldrpm | trim_release_old > $file1 -- check_header $newrpm | trim_release_new > $file2 -- -- echo "comparing filelist" -- if ! diff -au $file1 $file2; then -- if test -z "$check_all"; then -- rm $file1 $file2 -- return 1 -- fi -- fi -- -+ get_value QF_FILELIST $spec_old | trim_release_old > $file_old -+ get_value QF_FILELIST $spec_new | trim_release_new > $file_new -+ comp_file filelist $file_old $file_new || return 1 -+ - # now the md5sums. if they are different, we check more detailed - # if there are different filenames, we will already have aborted before - # file flag 64 means "ghost", filter those out. -- QF="[%{FILENAMES} %{FILEMD5S} %{FILEFLAGS}\n]\\n" -- check_header $oldrpm |grep -v " 64$"| trim_release_old > $file1 -- check_header $newrpm |grep -v " 64$"| trim_release_new > $file2 -- -+ get_value QF_CHECKSUM $spec_old | grep -v " 64$" | trim_release_old > $file_old -+ get_value QF_CHECKSUM $spec_new | grep -v " 64$" | trim_release_new > $file_new - RES=2 - # done if the same - echo "comparing file checksum" -- if cmp -s $file1 $file2; then -+ if cmp -s $file_old $file_new; then - RES=0 - fi -- -+ - # Get only files with different MD5sums -- files=`diff -U0 $file1 $file2 | fgrep -v +++ | grep ^+ | cut -b2- | awk '{print $1}'` -+ files=`diff -U0 $file_old $file_new | fgrep -v +++ | grep ^+ | cut -b2- | awk '{print $1}'` - - if test -f "$sh"; then - echo "creating rename script" -@@ -261,7 +280,7 @@ function cmp_spec () - done >> "${sh}" - fi - # -- rm $file1 $file2 -+ rm $file_old $file_new - return $RES - } - --- -2.9.0 - diff --git a/poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-check-for-fifo-named-pipe.patch b/poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-check-for-fifo-named-pipe.patch deleted file mode 100644 index e4f0c5416..000000000 --- a/poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-check-for-fifo-named-pipe.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a78fe4f792a9ac9f4d364e836c8855f48561d6f2 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Thu, 14 Jul 2016 19:52:18 -0700 -Subject: [PATCH 3/4] pkg-diff.sh: check for fifo(named pipe) - -Otherwise "cmp -s fifo1 fifo2" will wait for inputing forever. - -Upstream-Status: Submitted [https://github.com/openSUSE/build-compare/pull/10] - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - pkg-diff.sh | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/pkg-diff.sh b/pkg-diff.sh -index 5dd3a38..1f353aa 100644 ---- a/pkg-diff.sh -+++ b/pkg-diff.sh -@@ -735,6 +735,13 @@ check_single_file() - return 1 - fi - ;; -+ fifo*pipe*) -+ ftype_new="`/usr/bin/file new/$file | sed -e 's@^[^:]\+:[[:blank:]]*@@' -e 's@[[:blank:]]*$@@'`" -+ if [ "$ftype_new" = "$ftype" ]; then -+ return 0 -+ fi -+ return 1 -+ ;; - *) - if ! diff_two_files; then - return 1 --- -2.9.0 - diff --git a/poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-check_single_file-return-at-once-when-sa.patch b/poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-check_single_file-return-at-once-when-sa.patch deleted file mode 100644 index b42af2531..000000000 --- a/poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-check_single_file-return-at-once-when-sa.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 657983ef9ca8f8354172682e17408c4f6b5bc667 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Thu, 14 Jul 2016 19:46:08 -0700 -Subject: [PATCH 1/4] pkg-diff.sh: check_single_file(): return at once when - same - -If the two files are the same, return at once, this can save a lot of -time when there are archives inside archives. - -Upstream-Status: Submitted [https://github.com/openSUSE/build-compare/pull/10] - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - pkg-diff.sh | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/pkg-diff.sh b/pkg-diff.sh -index 3cf10aa..402d4a4 100644 ---- a/pkg-diff.sh -+++ b/pkg-diff.sh -@@ -293,6 +293,13 @@ check_compressed_file() - check_single_file() - { - local file="$1" -+ -+ # If the two files are the same, return at once. -+ if [ -f old/$file -a -f new/$file ]; then -+ if cmp -s old/$file new/$file; then -+ return 0 -+ fi -+ fi - case $file in - *.spec) - sed -i -e "s,Release:.*$release1,Release: @RELEASE@," old/$file --- -2.9.0 - diff --git a/poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-remove-space-in-the-end-for-ftype.patch b/poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-remove-space-in-the-end-for-ftype.patch deleted file mode 100644 index 807717233..000000000 --- a/poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-remove-space-in-the-end-for-ftype.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 836a6783df9c582a834fca239f227063a5687715 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Thu, 14 Jul 2016 19:49:12 -0700 -Subject: [PATCH 2/4] pkg-diff.sh: remove space in the end for ftype - -Versions of file like 5.14 returns a " " in the end, for example: -ftype="directory ", but we need ftype="directory", remove the space to -fix the problem. - -Upstream-Status: Submitted [https://github.com/openSUSE/build-compare/pull/10] - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - pkg-diff.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pkg-diff.sh b/pkg-diff.sh -index 402d4a4..5dd3a38 100644 ---- a/pkg-diff.sh -+++ b/pkg-diff.sh -@@ -633,7 +633,7 @@ check_single_file() - ;; - esac - -- ftype=`/usr/bin/file old/$file | sed 's@^[^:]\+:[[:blank:]]*@@'` -+ ftype=`/usr/bin/file old/$file | sed -e 's@^[^:]\+:[[:blank:]]*@@' -e 's@[[:blank:]]*$@@'` - case $ftype in - PE32\ executable*Mono\/\.Net\ assembly*) - echo "PE32 Mono/.Net assembly: $file" --- -2.9.0 - diff --git a/poky/meta/recipes-devtools/ccache/ccache_3.7.1.bb b/poky/meta/recipes-devtools/ccache/ccache_3.7.1.bb deleted file mode 100644 index 1db7094b7..000000000 --- a/poky/meta/recipes-devtools/ccache/ccache_3.7.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ccache.inc - -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=0094c59039cec66b8a4c905204333514" - -SRC_URI[md5sum] = "74339465ab87e0b406985ed69515f19b" -SRC_URI[sha256sum] = "e562fcdbe766406b6fe4bf97ce5c001d2be8a17465f33bcddefc9499bbb057d8" diff --git a/poky/meta/recipes-devtools/ccache/ccache_3.7.3.bb b/poky/meta/recipes-devtools/ccache/ccache_3.7.3.bb new file mode 100644 index 000000000..c6a682ee0 --- /dev/null +++ b/poky/meta/recipes-devtools/ccache/ccache_3.7.3.bb @@ -0,0 +1,7 @@ +require ccache.inc + +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=0094c59039cec66b8a4c905204333514" + +SRC_URI[md5sum] = "7be62ea6e190941a8c12a3d5394fd926" +SRC_URI[sha256sum] = "355955a61562c53c4ec4669e1c92708b0008f50d214b27f07a87cf4a1fa6b01e" diff --git a/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.2.bb b/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.2.bb new file mode 100644 index 000000000..7dc4e417f --- /dev/null +++ b/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "GNU unit testing framework, written in Expect and Tcl" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +SECTION = "devel" + +DEPENDS += "expect-native" + +inherit autotools + +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz" + +SRC_URI[md5sum] = "e1b07516533f351b3aba3423fafeffd6" +SRC_URI[sha256sum] = "0d0671e1b45189c5fc8ade4b3b01635fb9eeab45cf54f57db23e4c4c1a17d261" + +BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3.inc b/poky/meta/recipes-devtools/gcc/gcc-8.3.inc deleted file mode 100644 index 1781ff5b5..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3.inc +++ /dev/null @@ -1,112 +0,0 @@ -require gcc-common.inc - -# Third digit in PV should be incremented after a minor release - -PV = "8.3.0" - -# BINV should be incremented to a revision after a minor gcc release - -BINV = "8.3.0" - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-8.3:" - -DEPENDS =+ "mpfr gmp libmpc zlib flex-native" -NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native flex-native" - -LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" - -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 \ -" - -#RELEASE = "8.0.1-RC-20180427" -BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.xz" -#SRCREV = "f7cf798b73fd1a07098f9a490deec1e2a36e0bed" -#BASEURI ?= "git://github.com/gcc-mirror/gcc;branch=gcc-6-branch;protocol=git" -#BASEURI ?= "http://mirrors.concertpass.com/gcc/snapshots/${RELEASE}/gcc-${RELEASE}.tar.xz" - -SRC_URI = "\ - ${BASEURI} \ - file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \ - file://0002-gcc-poison-system-directories.patch \ - file://0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \ - file://0004-64-bit-multilib-hack.patch \ - file://0005-optional-libstdc.patch \ - file://0007-COLLECT_GCC_OPTIONS.patch \ - file://0008-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \ - file://0009-fortran-cross-compile-hack.patch \ - file://0010-cpp-honor-sysroot.patch \ - file://0011-MIPS64-Default-to-N64-ABI.patch \ - file://0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \ - file://0013-gcc-Fix-argument-list-too-long-error.patch \ - file://0014-Disable-sdt.patch \ - file://0015-libtool.patch \ - file://0016-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ - file://0017-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ - file://0018-Avoid-using-libdir-from-.la-which-usually-points-to-.patch \ - file://0019-export-CPP.patch \ - file://0020-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch \ - file://0021-Ensure-target-gcc-headers-can-be-included.patch \ - file://0022-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch \ - file://0023-Don-t-search-host-directory-during-relink-if-inst_pr.patch \ - file://0024-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \ - file://0025-aarch64-Add-support-for-musl-ldso.patch \ - file://0026-libcc1-fix-libcc1-s-install-path-and-rpath.patch \ - file://0027-handle-sysroot-support-for-nativesdk-gcc.patch \ - file://0028-Search-target-sysroot-gcc-version-specific-dirs-with.patch \ - file://0029-Fix-various-_FOR_BUILD-and-related-variables.patch \ - file://0030-nios2-Define-MUSL_DYNAMIC_LINKER.patch \ - file://0031-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch \ - file://0032-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch \ - file://0033-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch \ - file://0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch \ - file://0035-sync-gcc-stddef.h-with-musl.patch \ - file://0036-fix-segmentation-fault-in-precompiled-header-generat.patch \ - file://0037-Fix-for-testsuite-failure.patch \ - file://0038-Re-introduce-spe-commandline-options.patch \ - file://0039-riscv-Disable-multilib-for-OE.patch \ - file://0040-powerpc-powerpc64-Add-support-for-musl-ldso.patch \ - file://0041-Add-a-recursion-limit-to-libiberty-s-demangling-code.patch \ - file://0042-PR-debug-86964.patch \ - file://0043-PR85434-Prevent-spilling-of-stack-protector-guard-s-.patch \ -" -SRC_URI[md5sum] = "65b210b4bfe7e060051f799e0f994896" -SRC_URI[sha256sum] = "64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c" - -S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" -#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/git" -#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${RELEASE}" -B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" - -# Language Overrides -FORTRAN = "" - -LTO = "--enable-lto" -SSP ?= "--disable-libssp" -SSP_mingw32 = "--enable-libssp" - -EXTRA_OECONF_BASE = "\ - ${LTO} \ - ${SSP} \ - --enable-libitm \ - --disable-bootstrap \ - --disable-libmudflap \ - --with-system-zlib \ - ${@'--with-linker-hash-style=${LINKER_HASH_STYLE}' if '${LINKER_HASH_STYLE}' else ''} \ - --enable-linker-build-id \ - --with-ppl=no \ - --with-cloog=no \ - --enable-checking=release \ - --enable-cheaders=c_global \ - --without-isl \ -" - -EXTRA_OECONF_PATHS = "\ - --with-gxx-include-dir=/not/exist{target_includedir}/c++/${BINV} \ - --with-sysroot=/not/exist \ - --with-build-sysroot=${STAGING_DIR_TARGET} \ -" diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch deleted file mode 100644 index 4ad79e44b..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d7b284a9bede9d5059ad7e95a867254bf913c638 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 08:37:11 +0400 -Subject: [PATCH 01/40] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Inappropriate [embedded specific] ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 0601395512f..8c5b1e9d561 100755 ---- a/configure -+++ b/configure -@@ -7507,7 +7507,7 @@ fi - # for target_alias and gcc doesn't manage it consistently. - target_configargs="--cache-file=./config.cache ${target_configargs}" - --FLAGS_FOR_TARGET= -+FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET" - case " $target_configdirs " in - *" newlib "*) - case " $target_configargs " in -diff --git a/configure.ac b/configure.ac -index c3433336523..69c31c65ad7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3096,7 +3096,7 @@ fi - # for target_alias and gcc doesn't manage it consistently. - target_configargs="--cache-file=./config.cache ${target_configargs}" - --FLAGS_FOR_TARGET= -+FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET" - case " $target_configdirs " in - *" newlib "*) - case " $target_configargs " in --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0002-gcc-poison-system-directories.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0002-gcc-poison-system-directories.patch deleted file mode 100644 index e7ff12466..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0002-gcc-poison-system-directories.patch +++ /dev/null @@ -1,203 +0,0 @@ -From 95ec476dd7726cc9c1bfd6fb23ba3aea8bbf61a4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 08:59:00 +0400 -Subject: [PATCH 02/40] gcc: poison-system-directories - -Add /sw/include and /opt/include based on the original -zecke-no-host-includes.patch patch. The original patch checked for -/usr/include, /sw/include and /opt/include and then triggered a failure and -aborted. - -Instead, we add the two missing items to the current scan. If the user -wants this to be a failure, they can add "-Werror=poison-system-directories". - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending ---- - gcc/common.opt | 4 ++++ - gcc/config.in | 6 ++++++ - gcc/configure | 16 ++++++++++++++++ - gcc/configure.ac | 10 ++++++++++ - gcc/doc/invoke.texi | 9 +++++++++ - gcc/gcc.c | 2 ++ - gcc/incpath.c | 21 +++++++++++++++++++++ - 7 files changed, 68 insertions(+) - -diff --git a/gcc/common.opt b/gcc/common.opt -index b52ef0b38c8..0de3f0924cd 100644 ---- a/gcc/common.opt -+++ b/gcc/common.opt -@@ -679,6 +679,10 @@ Wreturn-local-addr - Common Var(warn_return_local_addr) Init(1) Warning - Warn about returning a pointer/reference to a local or temporary variable. - -+Wpoison-system-directories -+Common Var(flag_poison_system_directories) Init(1) Warning -+Warn for -I and -L options using system directories if cross compiling -+ - Wshadow - Common Var(warn_shadow) Warning - Warn when one variable shadows another. Same as -Wshadow=global. -diff --git a/gcc/config.in b/gcc/config.in -index 5bccb408016..1c784a8276b 100644 ---- a/gcc/config.in -+++ b/gcc/config.in -@@ -194,6 +194,12 @@ - #endif - - -+/* Define to warn for use of native system header directories */ -+#ifndef USED_FOR_TARGET -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+#endif -+ -+ - /* Define if you want all operations on RTL (the basic data structure of the - optimizer and back end) to be checked for dynamic type safety at runtime. - This is quite expensive. */ -diff --git a/gcc/configure b/gcc/configure -index 6121e163259..3901722400c 100755 ---- a/gcc/configure -+++ b/gcc/configure -@@ -953,6 +953,7 @@ with_system_zlib - enable_maintainer_mode - enable_link_mutex - enable_version_specific_runtime_libs -+enable_poison_system_directories - enable_plugin - enable_host_shared - enable_libquadmath_support -@@ -1696,6 +1697,8 @@ Optional Features: - --enable-version-specific-runtime-libs - specify that runtime libraries should be installed - in a compiler-specific directory -+ --enable-poison-system-directories -+ warn for use of native system header directories - --enable-plugin enable plugin support - --enable-host-shared build host code as shared libraries - --disable-libquadmath-support -@@ -29701,6 +29704,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi -+ - # Substitute configuration variables - - -diff --git a/gcc/configure.ac b/gcc/configure.ac -index b066cc609e1..1b1362f70fe 100644 ---- a/gcc/configure.ac -+++ b/gcc/configure.ac -@@ -6327,6 +6327,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs, - [specify that runtime libraries should be - installed in a compiler-specific directory])]) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system header directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system header directories]) -+fi -+ - # Substitute configuration variables - AC_SUBST(subdirs) - AC_SUBST(srcdir) -diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index e5c4e8125aa..fb228631a42 100644 ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -304,6 +304,7 @@ Objective-C and Objective-C++ Dialects}. - -Wpacked -Wpacked-bitfield-compat -Wpacked-not-aligned -Wpadded @gol - -Wparentheses -Wno-pedantic-ms-format @gol - -Wplacement-new -Wplacement-new=@var{n} @gol -+-Wno-poison-system-directories @gol - -Wpointer-arith -Wpointer-compare -Wno-pointer-to-int-cast @gol - -Wno-pragmas -Wredundant-decls -Wrestrict -Wno-return-local-addr @gol - -Wreturn-type -Wsequence-point -Wshadow -Wno-shadow-ivar @gol -@@ -5743,6 +5744,14 @@ made up of data only and thus requires no special treatment. But, for - most targets, it is made up of code and thus requires the stack to be - made executable in order for the program to work properly. - -+@item -Wno-poison-system-directories -+@opindex Wno-poison-system-directories -+Do not warn for @option{-I} or @option{-L} options using system -+directories such as @file{/usr/include} when cross compiling. This -+option is intended for use in chroot environments when such -+directories contain the correct headers and libraries for the target -+system rather than the host. -+ - @item -Wfloat-equal - @opindex Wfloat-equal - @opindex Wno-float-equal -diff --git a/gcc/gcc.c b/gcc/gcc.c -index a716f708259..02b3cd39fc2 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -1037,6 +1037,8 @@ proper position among the other output files. */ - "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \ - "%X %{o*} %{e*} %{N} %{n} %{r}\ - %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}} \ -+ %{Wno-poison-system-directories:--no-poison-system-directories} \ -+ %{Werror=poison-system-directories:--error-poison-system-directories} \ - %{static|no-pie|static-pie:} %{L*} %(mfwrap) %(link_libgcc) " \ - VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o " CHKP_SPEC " \ - %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ -diff --git a/gcc/incpath.c b/gcc/incpath.c -index b11c6a57939..9a457e02dd3 100644 ---- a/gcc/incpath.c -+++ b/gcc/incpath.c -@@ -26,6 +26,7 @@ - #include "intl.h" - #include "incpath.h" - #include "cppdefault.h" -+#include "diagnostic-core.h" - - /* Microsoft Windows does not natively support inodes. - VMS has non-numeric inodes. */ -@@ -393,6 +394,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose) - } - fprintf (stderr, _("End of search list.\n")); - } -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (flag_poison_system_directories) -+ { -+ struct cpp_dir *p; -+ -+ for (p = heads[INC_QUOTE]; p; p = p->next) -+ { -+ if ((!strncmp (p->name, "/usr/include", 12)) -+ || (!strncmp (p->name, "/usr/local/include", 18)) -+ || (!strncmp (p->name, "/usr/X11R6/include", 18)) -+ || (!strncmp (p->name, "/sw/include", 11)) -+ || (!strncmp (p->name, "/opt/include", 12))) -+ warning (OPT_Wpoison_system_directories, -+ "include location \"%s\" is unsafe for " -+ "cross-compilation", -+ p->name); -+ } -+ } -+#endif - } - - /* Use given -I paths for #include "..." but not #include <...>, and --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch deleted file mode 100644 index e62deb2e4..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 6640d7e39b13d1ef26d249153ab15d510fda3566 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 09:08:31 +0400 -Subject: [PATCH 03/40] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET - -Before committing, I noticed that PR/32161 was marked as a dup of PR/32009, but my previous patch did not fix it. - -This alternative patch is better because it lets you just use CFLAGS_FOR_TARGET to set the compilation flags for libgcc. Since bootstrapped target libraries are never compiled with the native compiler, it makes little sense to use different flags for stage1 and later stages. And it also makes little sense to use a different variable than CFLAGS_FOR_TARGET. - -Other changes I had to do include: - -- moving the creation of default CFLAGS_FOR_TARGET from Makefile.am to configure.ac, because otherwise the BOOT_CFLAGS are substituted into CFLAGS_FOR_TARGET (which is "-O2 -g $(CFLAGS)") via $(CFLAGS). It is also cleaner this way though. - -- passing the right CFLAGS to configure scripts as exported environment variables - -I also stopped passing LIBCFLAGS to configure scripts since they are unused in the whole src tree. And I updated the documentation as H-P reminded me to do. - -Bootstrapped/regtested i686-pc-linux-gnu, will commit to 4.4 shortly. Ok for 4.3? - -Signed-off-by: Paolo Bonzini <bonzini@gnu.org> -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending ---- - configure | 32 ++++++++++++++++++++++++++++++++ - 1 file changed, 32 insertions(+) - -diff --git a/configure b/configure -index 8c5b1e9d561..2d1fc6b94d9 100755 ---- a/configure -+++ b/configure -@@ -6768,6 +6768,38 @@ fi - - - -+# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS -+# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS -+# might also be empty (or "-g", if a non-GCC C++ compiler is in the path). -+# We want to ensure that TARGET libraries (which we know are built with -+# gcc) are built with "-O2 -g", so include those options when setting -+# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET. -+if test "x$CFLAGS_FOR_TARGET" = x; then -+ CFLAGS_FOR_TARGET=$CFLAGS -+ case " $CFLAGS " in -+ *" -O2 "*) ;; -+ *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;; -+ esac -+ case " $CFLAGS " in -+ *" -g "* | *" -g3 "*) ;; -+ *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;; -+ esac -+fi -+ -+ -+if test "x$CXXFLAGS_FOR_TARGET" = x; then -+ CXXFLAGS_FOR_TARGET=$CXXFLAGS -+ case " $CXXFLAGS " in -+ *" -O2 "*) ;; -+ *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;; -+ esac -+ case " $CXXFLAGS " in -+ *" -g "* | *" -g3 "*) ;; -+ *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;; -+ esac -+fi -+ -+ - # Handle --with-headers=XXX. If the value is not "yes", the contents of - # the named directory are copied to $(tooldir)/sys-include. - if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0004-64-bit-multilib-hack.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0004-64-bit-multilib-hack.patch deleted file mode 100644 index 371d87759..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0004-64-bit-multilib-hack.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 1e649d81ca662c4cdf73882ebb8a11f0f19f5baf Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 09:10:06 +0400 -Subject: [PATCH 04/40] 64-bit multilib hack. - -GCC has internal multilib handling code but it assumes a very specific rigid directory -layout. The build system implementation of multilib layout is very generic and allows -complete customisation of the library directories. - -This patch is a partial solution to allow any custom directories to be passed into gcc -and handled correctly. It forces gcc to use the base_libdir (which is the current -directory, "."). We need to do this for each multilib that is configured as we don't -know which compiler options may be being passed into the compiler. Since we have a compiler -per mulitlib at this point that isn't an issue. - -The one problem is the target compiler is only going to work for the default multlilib at -this point. Ideally we'd figure out which multilibs were being enabled with which paths -and be able to patch these entries with a complete set of correct paths but this we -don't have such code at this point. This is something the target gcc recipe should do -and override these platform defaults in its build config. - -RP 15/8/11 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com> - -Upstream-Status: Pending ---- - gcc/config/i386/t-linux64 | 6 ++---- - gcc/config/mips/t-linux64 | 10 +++------- - gcc/config/rs6000/t-linux64 | 5 ++--- - 3 files changed, 7 insertions(+), 14 deletions(-) - -diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 -index 8ea0faff369..266c6008004 100644 ---- a/gcc/config/i386/t-linux64 -+++ b/gcc/config/i386/t-linux64 -@@ -32,7 +32,5 @@ - # - comma=, - MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) --MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) --MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) --MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) --MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) -+MULTILIB_DIRNAMES = . . -+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) -diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 -index c017b7d04c5..126892cf40b 100644 ---- a/gcc/config/mips/t-linux64 -+++ b/gcc/config/mips/t-linux64 -@@ -17,10 +17,6 @@ - # <http://www.gnu.org/licenses/>. - - MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 --MULTILIB_DIRNAMES = n32 32 64 --MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el) --MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft) --MULTILIB_OSDIRNAMES = \ -- ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ -- ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ -- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) -+MULTILIB_DIRNAMES = . . . -+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) -+ -diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64 -index 0faa2a02df4..13fd8ca971e 100644 ---- a/gcc/config/rs6000/t-linux64 -+++ b/gcc/config/rs6000/t-linux64 -@@ -26,10 +26,9 @@ - # MULTILIB_OSDIRNAMES according to what is found on the target. - - MULTILIB_OPTIONS := m64/m32 --MULTILIB_DIRNAMES := 64 32 -+MULTILIB_DIRNAMES := . . - MULTILIB_EXTRA_OPTS := --MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu) --MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) -+MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) - - rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c - $(COMPILE) $< --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0005-optional-libstdc.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0005-optional-libstdc.patch deleted file mode 100644 index f9cf6c208..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0005-optional-libstdc.patch +++ /dev/null @@ -1,125 +0,0 @@ -From b486380dcc4758e856ab6d847eb358d05bd79d64 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 09:12:56 +0400 -Subject: [PATCH 05/40] optional libstdc - -gcc-runtime builds libstdc++ separately from gcc-cross-*. Its configure tests using g++ -will not run correctly since by default the linker will try to link against libstdc++ -which shouldn't exist yet. We need an option to disable -lstdc++ -option whilst leaving -lc, -lgcc and other automatic library dependencies added by gcc -driver. This patch adds such an option which only disables the -lstdc++. - -A "standard" gcc build uses xgcc and hence avoids this. We should ask upstream how to -do this officially, the likely answer is don't build libstdc++ separately. - -RP 29/6/10 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Inappropriate [embedded specific] ---- - gcc/c-family/c.opt | 4 ++++ - gcc/cp/g++spec.c | 1 + - gcc/doc/invoke.texi | 32 +++++++++++++++++++++++++++++++- - gcc/gcc.c | 1 + - 4 files changed, 37 insertions(+), 1 deletion(-) - -diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt -index f591b39be5a..2955fcea867 100644 ---- a/gcc/c-family/c.opt -+++ b/gcc/c-family/c.opt -@@ -1901,6 +1901,10 @@ nostdinc++ - C++ ObjC++ - Do not search standard system include directories for C++. - -+nostdlib++ -+Driver -+Do not link standard C++ runtime library -+ - o - C ObjC C++ ObjC++ Joined Separate - ; Documented in common.opt -diff --git a/gcc/cp/g++spec.c b/gcc/cp/g++spec.c -index 443a1746da3..e9b51be62ef 100644 ---- a/gcc/cp/g++spec.c -+++ b/gcc/cp/g++spec.c -@@ -137,6 +137,7 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, - switch (decoded_options[i].opt_index) - { - case OPT_nostdlib: -+ case OPT_nostdlib__: - case OPT_nodefaultlibs: - library = -1; - break; -diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index fb228631a42..310ba8109ed 100644 ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -212,6 +212,9 @@ in the following sections. - -fno-weak -nostdinc++ @gol - -fvisibility-inlines-hidden @gol - -fvisibility-ms-compat @gol -+-fvtable-verify=@r{[}std@r{|}preinit@r{|}none@r{]} @gol -+-fvtv-counts -fvtv-debug @gol -+-nostdlib++ @gol - -fext-numeric-literals @gol - -Wabi=@var{n} -Wabi-tag -Wconversion-null -Wctor-dtor-privacy @gol - -Wdelete-non-virtual-dtor -Wliteral-suffix -Wmultiple-inheritance @gol -@@ -510,7 +513,7 @@ Objective-C and Objective-C++ Dialects}. - -s -static -static-pie -static-libgcc -static-libstdc++ @gol - -static-libasan -static-libtsan -static-liblsan -static-libubsan @gol - -static-libmpx -static-libmpxwrappers @gol ---shared -shared-libgcc -symbolic @gol -+-shared -shared-libgcc -symbolic -nostdlib++ @gol - -T @var{script} -Wl,@var{option} -Xlinker @var{option} @gol - -u @var{symbol} -z @var{keyword}} - -@@ -12359,6 +12362,33 @@ library subroutines. - constructors are called; @pxref{Collect2,,@code{collect2}, gccint, - GNU Compiler Collection (GCC) Internals}.) - -+@item -nostdlib++ -+@opindex nostdlib++ -+Do not use the standard system C++ runtime libraries when linking. -+Only the libraries you specify will be passed to the linker. -+ -+@cindex @option{-lgcc}, use with @option{-nostdlib} -+@cindex @option{-nostdlib} and unresolved references -+@cindex unresolved references and @option{-nostdlib} -+@cindex @option{-lgcc}, use with @option{-nodefaultlibs} -+@cindex @option{-nodefaultlibs} and unresolved references -+@cindex unresolved references and @option{-nodefaultlibs} -+One of the standard libraries bypassed by @option{-nostdlib} and -+@option{-nodefaultlibs} is @file{libgcc.a}, a library of internal subroutines -+which GCC uses to overcome shortcomings of particular machines, or special -+needs for some languages. -+(@xref{Interface,,Interfacing to GCC Output,gccint,GNU Compiler -+Collection (GCC) Internals}, -+for more discussion of @file{libgcc.a}.) -+In most cases, you need @file{libgcc.a} even when you want to avoid -+other standard libraries. In other words, when you specify @option{-nostdlib} -+or @option{-nodefaultlibs} you should usually specify @option{-lgcc} as well. -+This ensures that you have no unresolved references to internal GCC -+library subroutines. -+(An example of such an internal subroutine is @code{__main}, used to ensure C++ -+constructors are called; @pxref{Collect2,,@code{collect2}, gccint, -+GNU Compiler Collection (GCC) Internals}.) -+ - @item -pie - @opindex pie - Produce a dynamically linked position independent executable on targets -diff --git a/gcc/gcc.c b/gcc/gcc.c -index 02b3cd39fc2..8cd27a5dad5 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -1047,6 +1047,7 @@ proper position among the other output files. */ - %(mflib) " STACK_SPLIT_SPEC "\ - %{fprofile-arcs|fprofile-generate*|coverage:-lgcov} " SANITIZER_SPEC " \ - %{!nostdlib:%{!nodefaultlibs:%(link_ssp) %(link_gcc_c_sequence)}}\ -+ %{!nostdlib++:}\ - %{!nostdlib:%{!nostartfiles:%E}} %{T*} \n%(post_link) }}}}}}" - #endif - --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0007-COLLECT_GCC_OPTIONS.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0007-COLLECT_GCC_OPTIONS.patch deleted file mode 100644 index 8c7e72e1b..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0007-COLLECT_GCC_OPTIONS.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 209e46f45382088caab54425b92b5dfc43ebb4fc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 09:16:28 +0400 -Subject: [PATCH 07/40] COLLECT_GCC_OPTIONS - -This patch adds --sysroot into COLLECT_GCC_OPTIONS which is used to -invoke collect2. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending ---- - gcc/gcc.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/gcc/gcc.c b/gcc/gcc.c -index 8cd27a5dad5..d355d65583a 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -4677,6 +4677,15 @@ set_collect_gcc_options (void) - sizeof ("COLLECT_GCC_OPTIONS=") - 1); - - first_time = TRUE; -+#ifdef HAVE_LD_SYSROOT -+ if (target_system_root_changed && target_system_root) -+ { -+ obstack_grow (&collect_obstack, "'--sysroot=", sizeof("'--sysroot=")-1); -+ obstack_grow (&collect_obstack, target_system_root,strlen(target_system_root)); -+ obstack_grow (&collect_obstack, "'", 1); -+ first_time = FALSE; -+ } -+#endif - for (i = 0; (int) i < n_switches; i++) - { - const char *const *args; --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0008-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0008-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch deleted file mode 100644 index f9632afec..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0008-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 3bcbdf5ade54a72820ad7798119d0bbad4baf6ec Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 09:17:25 +0400 -Subject: [PATCH 08/40] Use the defaults.h in ${B} instead of ${S}, and t-oe in - ${B} - -Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that -the source can be shared between gcc-cross-initial, -gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending - -While compiling gcc-crosssdk-initial-x86_64 on some host, there is -occasionally failure that test the existance of default.h doesn't -work, the reason is tm_include_list='** defaults.h' rather than -tm_include_list='** ./defaults.h' - -So we add the test condition for this situation. -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - gcc/Makefile.in | 2 +- - gcc/configure | 4 ++-- - gcc/configure.ac | 4 ++-- - gcc/mkconfig.sh | 4 ++-- - 4 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 20bee0494b1..1367136bfac 100644 ---- a/gcc/Makefile.in -+++ b/gcc/Makefile.in -@@ -538,7 +538,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ - TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@ - - xmake_file=@xmake_file@ --tmake_file=@tmake_file@ -+tmake_file=@tmake_file@ ./t-oe - TM_ENDIAN_CONFIG=@TM_ENDIAN_CONFIG@ - TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@ - TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@ -diff --git a/gcc/configure b/gcc/configure -index 0c9b8ac5f55..134c2c2f156 100755 ---- a/gcc/configure -+++ b/gcc/configure -@@ -12158,8 +12158,8 @@ for f in $tm_file; do - tm_include_list="${tm_include_list} $f" - ;; - defaults.h ) -- tm_file_list="${tm_file_list} \$(srcdir)/$f" -- tm_include_list="${tm_include_list} $f" -+ tm_file_list="${tm_file_list} ./$f" -+ tm_include_list="${tm_include_list} ./$f" - ;; - * ) - tm_file_list="${tm_file_list} \$(srcdir)/config/$f" -diff --git a/gcc/configure.ac b/gcc/configure.ac -index 53840363115..0c3c82e4ff7 100644 ---- a/gcc/configure.ac -+++ b/gcc/configure.ac -@@ -1922,8 +1922,8 @@ for f in $tm_file; do - tm_include_list="${tm_include_list} $f" - ;; - defaults.h ) -- tm_file_list="${tm_file_list} \$(srcdir)/$f" -- tm_include_list="${tm_include_list} $f" -+ tm_file_list="${tm_file_list} ./$f" -+ tm_include_list="${tm_include_list} ./$f" - ;; - * ) - tm_file_list="${tm_file_list} \$(srcdir)/config/$f" -diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh -index 0f75c863c0b..68d8d6613cf 100644 ---- a/gcc/mkconfig.sh -+++ b/gcc/mkconfig.sh -@@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then - if [ $# -ge 1 ]; then - echo '#ifdef IN_GCC' >> ${output}T - for file in "$@"; do -- if test x"$file" = x"defaults.h"; then -+ if test x"$file" = x"./defaults.h" -o x"$file" = x"defaults.h"; then - postpone_defaults_h="yes" - else - echo "# include \"$file\"" >> ${output}T -@@ -106,7 +106,7 @@ esac - - # If we postponed including defaults.h, add the #include now. - if test x"$postpone_defaults_h" = x"yes"; then -- echo "# include \"defaults.h\"" >> ${output}T -+ echo "# include \"./defaults.h\"" >> ${output}T - fi - - # Add multiple inclusion protection guard, part two. --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0009-fortran-cross-compile-hack.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0009-fortran-cross-compile-hack.patch deleted file mode 100644 index 50d895bfd..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0009-fortran-cross-compile-hack.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e654573352d28f160f379ee77e4067cf108714d0 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 09:20:01 +0400 -Subject: [PATCH 09/40] fortran cross-compile hack. - -* Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used -used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross -directory. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Inappropriate [embedded specific] ---- - libgfortran/configure | 2 +- - libgfortran/configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libgfortran/configure b/libgfortran/configure -index 91fce8fecd0..6747f86eb98 100755 ---- a/libgfortran/configure -+++ b/libgfortran/configure -@@ -12883,7 +12883,7 @@ esac - - # We need gfortran to compile parts of the library - #AC_PROG_FC(gfortran) --FC="$GFORTRAN" -+#FC="$GFORTRAN" - ac_ext=${ac_fc_srcext-f} - ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' - ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' -diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac -index bf6d3634dda..9dbe43cc616 100644 ---- a/libgfortran/configure.ac -+++ b/libgfortran/configure.ac -@@ -250,7 +250,7 @@ AC_SUBST(enable_static) - - # We need gfortran to compile parts of the library - #AC_PROG_FC(gfortran) --FC="$GFORTRAN" -+#FC="$GFORTRAN" - AC_PROG_FC(gfortran) - - # extra LD Flags which are required for targets --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0010-cpp-honor-sysroot.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0010-cpp-honor-sysroot.patch deleted file mode 100644 index 037eacf43..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0010-cpp-honor-sysroot.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 2ae7af4eb70eff6aeda1fe96333ff50cfaa9d906 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 09:22:00 +0400 -Subject: [PATCH 10/40] cpp: honor sysroot. - -Currently, if the gcc toolchain is relocated and installed from sstate, then you try and compile -preprocessed source (.i or .ii files), the compiler will try and access the builtin sysroot location -rather than the --sysroot option specified on the commandline. If access to that directory is -permission denied (unreadable), gcc will error. - -This happens when ccache is in use due to the fact it uses preprocessed source files. - -The fix below adds %I to the cpp-output spec macro so the default substitutions for -iprefix, --isystem, -isysroot happen and the correct sysroot is used. - -[YOCTO #2074] - -RP 2012/04/13 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending ---- - gcc/cp/lang-specs.h | 2 +- - gcc/gcc.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h -index f0802b8915c..f324d299849 100644 ---- a/gcc/cp/lang-specs.h -+++ b/gcc/cp/lang-specs.h -@@ -64,5 +64,5 @@ along with GCC; see the file COPYING3. If not see - {".ii", "@c++-cpp-output", 0, 0, 0}, - {"@c++-cpp-output", - "%{!M:%{!MM:%{!E:\ -- cc1plus -fpreprocessed %i %(cc1_options) %2\ -+ cc1plus -fpreprocessed %i %I %(cc1_options) %2\ - %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, -diff --git a/gcc/gcc.c b/gcc/gcc.c -index d355d65583a..570cdc00034 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -1343,7 +1343,7 @@ static const struct compiler default_compilers[] = - %W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0}, - {".i", "@cpp-output", 0, 0, 0}, - {"@cpp-output", -- "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, -+ "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %I %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, - {".s", "@assembler", 0, 0, 0}, - {"@assembler", - "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0}, --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0011-MIPS64-Default-to-N64-ABI.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0011-MIPS64-Default-to-N64-ABI.patch deleted file mode 100644 index c863cff93..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0011-MIPS64-Default-to-N64-ABI.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 1e1ea0eb55a594ac4cd7b838f74dec7405aae02b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 09:23:08 +0400 -Subject: [PATCH 11/40] MIPS64: Default to N64 ABI - -MIPS64 defaults to n32 ABI, this patch makes it -so that it defaults to N64 ABI - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Inappropriate [OE config specific] ---- - gcc/config.gcc | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/gcc/config.gcc b/gcc/config.gcc -index 7af8e028104..fc7c91246ed 100644 ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -2143,29 +2143,29 @@ mips*-*-linux*) # Linux MIPS, either endian. - default_mips_arch=mips32 - ;; - mips64el-st-linux-gnu) -- default_mips_abi=n32 -+ default_mips_abi=64 - tm_file="${tm_file} mips/st.h" - tmake_file="${tmake_file} mips/t-st" - enable_mips_multilibs="yes" - ;; - mips64octeon*-*-linux*) -- default_mips_abi=n32 -+ default_mips_abi=64 - tm_defines="${tm_defines} MIPS_CPU_STRING_DEFAULT=\\\"octeon\\\"" - target_cpu_default=MASK_SOFT_FLOAT_ABI - enable_mips_multilibs="yes" - ;; - mipsisa64r6*-*-linux*) -- default_mips_abi=n32 -+ default_mips_abi=64 - default_mips_arch=mips64r6 - enable_mips_multilibs="yes" - ;; - mipsisa64r2*-*-linux*) -- default_mips_abi=n32 -+ default_mips_abi=64 - default_mips_arch=mips64r2 - enable_mips_multilibs="yes" - ;; - mips64*-*-linux* | mipsisa64*-*-linux*) -- default_mips_abi=n32 -+ default_mips_abi=64 - enable_mips_multilibs="yes" - ;; - esac --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch deleted file mode 100644 index d3be10f20..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch +++ /dev/null @@ -1,248 +0,0 @@ -From 6f8649936df3677109b8396f563c716ae8b237fe Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 09:24:50 +0400 -Subject: [PATCH 12/40] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER - relative to SYSTEMLIBS_DIR - -This patch defines GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER -relative to SYSTEMLIBS_DIR which can be set in generated headers -This breaks the assumption of hardcoded multilib in gcc -Change is only for the supported architectures in OE including -SH, sparc, alpha for possible future support (if any) - -Removes the do_headerfix task in metadata - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Inappropriate [OE configuration] ---- - gcc/config/alpha/linux-elf.h | 4 ++-- - gcc/config/arm/linux-eabi.h | 4 ++-- - gcc/config/arm/linux-elf.h | 2 +- - gcc/config/i386/linux.h | 2 +- - gcc/config/i386/linux64.h | 6 +++--- - gcc/config/linux.h | 8 ++++---- - gcc/config/mips/linux.h | 12 ++++++------ - gcc/config/riscv/linux.h | 2 +- - gcc/config/rs6000/linux64.h | 16 ++++++---------- - gcc/config/sh/linux.h | 2 +- - gcc/config/sparc/linux.h | 2 +- - gcc/config/sparc/linux64.h | 4 ++-- - 12 files changed, 30 insertions(+), 34 deletions(-) - -diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h -index 36b74dc1993..02373578af8 100644 ---- a/gcc/config/alpha/linux-elf.h -+++ b/gcc/config/alpha/linux-elf.h -@@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see - #define EXTRA_SPECS \ - { "elf_dynamic_linker", ELF_DYNAMIC_LINKER }, - --#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" --#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" -+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" -+#define UCLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-uClibc.so.0" - #if DEFAULT_LIBC == LIBC_UCLIBC - #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" - #elif DEFAULT_LIBC == LIBC_GLIBC -diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h -index 8585fde3d41..b3af68cac57 100644 ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -62,8 +62,8 @@ - GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */ - - #undef GLIBC_DYNAMIC_LINKER --#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3" --#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3" -+#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT SYSTEMLIBS_DIR "ld-linux.so.3" -+#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT SYSTEMLIBS_DIR "ld-linux-armhf.so.3" - #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT - - #define GLIBC_DYNAMIC_LINKER \ -diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h -index cfcd9cb1a5c..a798e987ecb 100644 ---- a/gcc/config/arm/linux-elf.h -+++ b/gcc/config/arm/linux-elf.h -@@ -60,7 +60,7 @@ - - #define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" - --#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" - - #define LINUX_TARGET_LINK_SPEC "%{h*} \ - %{static:-Bstatic} \ -diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h -index 69f97f15b0d..71bc31d9231 100644 ---- a/gcc/config/i386/linux.h -+++ b/gcc/config/i386/linux.h -@@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see - <http://www.gnu.org/licenses/>. */ - - #define GNU_USER_LINK_EMULATION "elf_i386" --#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" - - #undef MUSL_DYNAMIC_LINKER - #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" -diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h -index f2d913e30ac..8725f33d8a5 100644 ---- a/gcc/config/i386/linux64.h -+++ b/gcc/config/i386/linux64.h -@@ -27,9 +27,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - #define GNU_USER_LINK_EMULATION64 "elf_x86_64" - #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" - --#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" --#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -+#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-linux-x32.so.2" - - #undef MUSL_DYNAMIC_LINKER32 - #define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" -diff --git a/gcc/config/linux.h b/gcc/config/linux.h -index 2ea4ff92c1d..487b0c0923b 100644 ---- a/gcc/config/linux.h -+++ b/gcc/config/linux.h -@@ -81,10 +81,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - GLIBC_DYNAMIC_LINKER must be defined for each target using them, or - GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets - supporting both 32-bit and 64-bit compilation. */ --#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" --#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" --#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" --#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0" -+#define UCLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-uClibc.so.0" -+#define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0" -+#define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0" -+#define UCLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ldx32-uClibc.so.0" - #define BIONIC_DYNAMIC_LINKER "/system/bin/linker" - #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" - #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" -diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h -index 2dfd0c18b90..12057c51b5e 100644 ---- a/gcc/config/mips/linux.h -+++ b/gcc/config/mips/linux.h -@@ -22,20 +22,20 @@ along with GCC; see the file COPYING3. If not see - #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" - - #define GLIBC_DYNAMIC_LINKER32 \ -- "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}" -+ "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}" - #define GLIBC_DYNAMIC_LINKER64 \ -- "%{mnan=2008:/lib64/ld-linux-mipsn8.so.1;:/lib64/ld.so.1}" -+ "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}" - #define GLIBC_DYNAMIC_LINKERN32 \ -- "%{mnan=2008:/lib32/ld-linux-mipsn8.so.1;:/lib32/ld.so.1}" -+ "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}" - - #undef UCLIBC_DYNAMIC_LINKER32 - #define UCLIBC_DYNAMIC_LINKER32 \ -- "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}" -+ "%{mnan=2008:" SYSTEMLIBS_DIR "ld-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld-uClibc.so.0}" - #undef UCLIBC_DYNAMIC_LINKER64 - #define UCLIBC_DYNAMIC_LINKER64 \ -- "%{mnan=2008:/lib/ld64-uClibc-mipsn8.so.0;:/lib/ld64-uClibc.so.0}" -+ "%{mnan=2008:" SYSTEMLIBS_DIR "ld64-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld64-uClibc.so.0}" - #define UCLIBC_DYNAMIC_LINKERN32 \ -- "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}" -+ "%{mnan=2008:" SYSTEMLIBS_DIR "ld-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld-uClibc.so.0}" - - #undef MUSL_DYNAMIC_LINKER32 - #define MUSL_DYNAMIC_LINKER32 \ -diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h -index aa8a28d5d31..ebf9551c955 100644 ---- a/gcc/config/riscv/linux.h -+++ b/gcc/config/riscv/linux.h -@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see - GNU_USER_TARGET_OS_CPP_BUILTINS(); \ - } while (0) - --#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1" -+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1" - - #define MUSL_ABI_SUFFIX \ - "%{mabi=ilp32:-sf}" \ -diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h -index 44eab40a234..54aa8d957e7 100644 ---- a/gcc/config/rs6000/linux64.h -+++ b/gcc/config/rs6000/linux64.h -@@ -413,16 +413,11 @@ extern int dot_symbols; - #undef LINK_OS_DEFAULT_SPEC - #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" - --#define GLIBC_DYNAMIC_LINKER32 "%(dynamic_linker_prefix)/lib/ld.so.1" -- -+#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld.so.1" - #ifdef LINUX64_DEFAULT_ABI_ELFv2 --#define GLIBC_DYNAMIC_LINKER64 \ --"%{mabi=elfv1:%(dynamic_linker_prefix)/lib64/ld64.so.1;" \ --":%(dynamic_linker_prefix)/lib64/ld64.so.2}" -+#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:" SYSTEMLIBS_DIR "ld64.so.1;:" SYSTEMLIBS_DIR "ld64.so.2}" - #else --#define GLIBC_DYNAMIC_LINKER64 \ --"%{mabi=elfv2:%(dynamic_linker_prefix)/lib64/ld64.so.2;" \ --":%(dynamic_linker_prefix)/lib64/ld64.so.1}" -+#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:" SYSTEMLIBS_DIR "ld64.so.2;:" SYSTEMLIBS_DIR "ld64.so.1}" - #endif - - #define MUSL_DYNAMIC_LINKER32 \ -@@ -430,8 +425,9 @@ extern int dot_symbols; - #define MUSL_DYNAMIC_LINKER64 \ - "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" - --#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" --#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" -+#define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0" -+#define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0" -+ - #if DEFAULT_LIBC == LIBC_UCLIBC - #define CHOOSE_DYNAMIC_LINKER(G, U, M) \ - "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" -diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h -index 6d2ccd012ba..ec78a89ce15 100644 ---- a/gcc/config/sh/linux.h -+++ b/gcc/config/sh/linux.h -@@ -64,7 +64,7 @@ along with GCC; see the file COPYING3. If not see - "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E MUSL_DYNAMIC_LINKER_FP \ - "%{mfdpic:-fdpic}.so.1" - --#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" - - #undef SUBTARGET_LINK_EMUL_SUFFIX - #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}" -diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h -index 9fb03af0fe9..401fddbbb22 100644 ---- a/gcc/config/sparc/linux.h -+++ b/gcc/config/sparc/linux.h -@@ -83,7 +83,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); - When the -shared link option is used a final link is not being - done. */ - --#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" - - #undef LINK_SPEC - #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ -diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h -index c1fe42165b7..26a79bfa2e3 100644 ---- a/gcc/config/sparc/linux64.h -+++ b/gcc/config/sparc/linux64.h -@@ -84,8 +84,8 @@ along with GCC; see the file COPYING3. If not see - When the -shared link option is used a final link is not being - done. */ - --#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux.so.2" - - #ifdef SPARC_BI_ARCH - --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0013-gcc-Fix-argument-list-too-long-error.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0013-gcc-Fix-argument-list-too-long-error.patch deleted file mode 100644 index e9d2cac22..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0013-gcc-Fix-argument-list-too-long-error.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9e815965fbaa90134be0e777cfc2fbcfab16b674 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 09:26:37 +0400 -Subject: [PATCH 13/40] gcc: Fix argument list too long error. - -There would be an "Argument list too long" error when the -build directory is longer than 200, this is caused by: - -headers=`echo $(PLUGIN_HEADERS) | tr ' ' '\012' | sort -u` - -The PLUGIN_HEADERS is too long before sort, so the "echo" can't handle -it, use the $(sort list) of GNU make which can handle the too long list -would fix the problem, the header would be short enough after sorted. -The "tr ' ' '\012'" was used for translating the space to "\n", the -$(sort list) doesn't need this. - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending ---- - gcc/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 1367136bfac..71a8275c39f 100644 ---- a/gcc/Makefile.in -+++ b/gcc/Makefile.in -@@ -3538,7 +3538,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype - # We keep the directory structure for files in config or c-family and .def - # files. All other files are flattened to a single directory. - $(mkinstalldirs) $(DESTDIR)$(plugin_includedir) -- headers=`echo $(PLUGIN_HEADERS) $$(cd $(srcdir); echo *.h *.def) | tr ' ' '\012' | sort -u`; \ -+ headers="$(sort $(PLUGIN_HEADERS) $$(cd $(srcdir); echo *.h *.def))"; \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \ - for file in $$headers; do \ - if [ -f $$file ] ; then \ --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0014-Disable-sdt.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0014-Disable-sdt.patch deleted file mode 100644 index 2bc44515c..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0014-Disable-sdt.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 00c7a7fdd4b4aad9e57d8b541de17ad209b6cd06 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 09:28:10 +0400 -Subject: [PATCH 14/40] Disable sdt. - -We don't list dtrace in DEPENDS so we shouldn't be depending on this header. -It may or may not exist from preivous builds though. To be determinstic, disable -sdt.h usage always. This avoids build failures if the header is removed after configure -but before libgcc is compiled for example. - -RP 2012/8/7 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Disable sdt for libstdc++-v3. - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - -Upstream-Status: Inappropriate [hack] ---- - gcc/configure | 12 ++++++------ - gcc/configure.ac | 18 +++++++++--------- - libstdc++-v3/configure | 6 +++--- - libstdc++-v3/configure.ac | 2 +- - 4 files changed, 19 insertions(+), 19 deletions(-) - -diff --git a/gcc/configure b/gcc/configure -index 134c2c2f156..5111ec0aabb 100755 ---- a/gcc/configure -+++ b/gcc/configure -@@ -29282,12 +29282,12 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5 - $as_echo_n "checking sys/sdt.h in the target C library... " >&6; } - have_sys_sdt_h=no --if test -f $target_header_dir/sys/sdt.h; then -- have_sys_sdt_h=yes -- --$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h -- --fi -+#if test -f $target_header_dir/sys/sdt.h; then -+# have_sys_sdt_h=yes -+# -+#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h -+# -+#fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5 - $as_echo "$have_sys_sdt_h" >&6; } - -diff --git a/gcc/configure.ac b/gcc/configure.ac -index 0c3c82e4ff7..3e09af916fd 100644 ---- a/gcc/configure.ac -+++ b/gcc/configure.ac -@@ -5943,15 +5943,15 @@ fi - AC_SUBST([enable_default_ssp]) - - # Test for <sys/sdt.h> on the target. --GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H]) --AC_MSG_CHECKING(sys/sdt.h in the target C library) --have_sys_sdt_h=no --if test -f $target_header_dir/sys/sdt.h; then -- have_sys_sdt_h=yes -- AC_DEFINE(HAVE_SYS_SDT_H, 1, -- [Define if your target C library provides sys/sdt.h]) --fi --AC_MSG_RESULT($have_sys_sdt_h) -+#GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H]) -+#AC_MSG_CHECKING(sys/sdt.h in the target C library) -+#have_sys_sdt_h=no -+#if test -f $target_header_dir/sys/sdt.h; then -+# have_sys_sdt_h=yes -+# AC_DEFINE(HAVE_SYS_SDT_H, 1, -+# [Define if your target C library provides sys/sdt.h]) -+#fi -+#AC_MSG_RESULT($have_sys_sdt_h) - - # Check if TFmode long double should be used by default or not. - # Some glibc targets used DFmode long double, but with glibc 2.4 -diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure -index 5535bfa2b5a..13d793f5059 100755 ---- a/libstdc++-v3/configure -+++ b/libstdc++-v3/configure -@@ -21786,11 +21786,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - -- if test $glibcxx_cv_sys_sdt_h = yes; then -+# if test $glibcxx_cv_sys_sdt_h = yes; then - --$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h -+#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h - -- fi -+# fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_sys_sdt_h" >&5 - $as_echo "$glibcxx_cv_sys_sdt_h" >&6; } - -diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac -index 0ef96270c9c..afe55a1b215 100644 ---- a/libstdc++-v3/configure.ac -+++ b/libstdc++-v3/configure.ac -@@ -230,7 +230,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN - GLIBCXX_CHECK_SC_NPROC_ONLN - GLIBCXX_CHECK_PTHREADS_NUM_PROCESSORS_NP - GLIBCXX_CHECK_SYSCTL_HW_NCPU --GLIBCXX_CHECK_SDT_H -+#GLIBCXX_CHECK_SDT_H - - # Check for available headers. - AC_CHECK_HEADERS([endian.h execinfo.h float.h fp.h ieeefp.h inttypes.h \ --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0015-libtool.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0015-libtool.patch deleted file mode 100644 index 750f8a244..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0015-libtool.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 80f2b01b3f917cea08294328c8bbc51dadece4af Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 09:29:11 +0400 -Subject: [PATCH 15/40] libtool - -libstdc++ from gcc-runtime gets created with -rpath=/usr/lib/../lib for qemux86-64 -when running on am x86_64 build host. - -This patch stops this speading to libdir in the libstdc++.la file within libtool. -Arguably, it shouldn't be passing this into libtool in the first place but -for now this resolves the nastiest problems this causes. - -func_normal_abspath would resolve an empty path to `pwd` so we need -to filter the zero case. - -RP 2012/8/24 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending ---- - ltmain.sh | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ltmain.sh b/ltmain.sh -index 9503ec85d70..0121fba707f 100644 ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -6359,6 +6359,10 @@ func_mode_link () - func_warning "ignoring multiple \`-rpath's for a libtool library" - - install_libdir="$1" -+ if test -n "$install_libdir"; then -+ func_normal_abspath "$install_libdir" -+ install_libdir=$func_normal_abspath_result -+ fi - - oldlibs= - if test -z "$rpath"; then --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0016-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0016-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch deleted file mode 100644 index 9b1b4d4df..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0016-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a66ec1e382bf869749588f072a4a7c09039f2b3a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 09:30:32 +0400 -Subject: [PATCH 16/40] gcc: armv4: pass fix-v4bx to linker to support EABI. - -The LINK_SPEC for linux gets overwritten by linux-eabi.h which -means the value of TARGET_FIX_V4BX_SPEC gets lost and as a result -the option is not passed to linker when chosing march=armv4 -This patch redefines this in linux-eabi.h and reinserts it -for eabi defaulting toolchains. - -We might want to send it upstream. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending ---- - gcc/config/arm/linux-eabi.h | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h -index b3af68cac57..330b6e13c5f 100644 ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -88,10 +88,14 @@ - #define MUSL_DYNAMIC_LINKER \ - "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1" - -+/* For armv4 we pass --fix-v4bx to linker to support EABI */ -+#undef TARGET_FIX_V4BX_SPEC -+#define TARGET_FIX_V4BX_SPEC "%{mcpu=arm8|mcpu=arm810|mcpu=strongarm*|march=armv4: --fix-v4bx}" -+ - /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to - use the GNU/Linux version, not the generic BPABI version. */ - #undef LINK_SPEC --#define LINK_SPEC EABI_LINK_SPEC \ -+#define LINK_SPEC TARGET_FIX_V4BX_SPEC EABI_LINK_SPEC \ - LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC, \ - LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC) - --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0017-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0017-Use-the-multilib-config-files-from-B-instead-of-usin.patch deleted file mode 100644 index 382fecdbc..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0017-Use-the-multilib-config-files-from-B-instead-of-usin.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 624db734f656ad8cdf8b3cf3fc8e860b70c6c251 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 09:33:04 +0400 -Subject: [PATCH 17/40] Use the multilib config files from ${B} instead of - using the ones from ${S} - -Use the multilib config files from ${B} instead of using the ones from ${S} -so that the source can be shared between gcc-cross-initial, -gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - -Upstream-Status: Inappropriate [configuration] ---- - gcc/configure | 22 ++++++++++++++++++---- - gcc/configure.ac | 22 ++++++++++++++++++---- - 2 files changed, 36 insertions(+), 8 deletions(-) - -diff --git a/gcc/configure b/gcc/configure -index 5111ec0aabb..3d9dcbdc93d 100755 ---- a/gcc/configure -+++ b/gcc/configure -@@ -12138,10 +12138,20 @@ done - tmake_file_= - for f in ${tmake_file} - do -- if test -f ${srcdir}/config/$f -- then -- tmake_file_="${tmake_file_} \$(srcdir)/config/$f" -- fi -+ case $f in -+ */t-linux64 ) -+ if test -f ./config/$f -+ then -+ tmake_file_="${tmake_file_} ./config/$f" -+ fi -+ ;; -+ * ) -+ if test -f ${srcdir}/config/$f -+ then -+ tmake_file_="${tmake_file_} \$(srcdir)/config/$f" -+ fi -+ ;; -+ esac - done - tmake_file="${tmake_file_}" - -@@ -12152,6 +12162,10 @@ tm_file_list="options.h" - tm_include_list="options.h insn-constants.h" - for f in $tm_file; do - case $f in -+ */linux64.h ) -+ tm_file_list="${tm_file_list} ./config/$f" -+ tm_include_list="${tm_include_list} ./config/$f" -+ ;; - ./* ) - f=`echo $f | sed 's/^..//'` - tm_file_list="${tm_file_list} $f" -diff --git a/gcc/configure.ac b/gcc/configure.ac -index 3e09af916fd..e09c840b605 100644 ---- a/gcc/configure.ac -+++ b/gcc/configure.ac -@@ -1902,10 +1902,20 @@ done - tmake_file_= - for f in ${tmake_file} - do -- if test -f ${srcdir}/config/$f -- then -- tmake_file_="${tmake_file_} \$(srcdir)/config/$f" -- fi -+ case $f in -+ */t-linux64 ) -+ if test -f ./config/$f -+ then -+ tmake_file_="${tmake_file_} ./config/$f" -+ fi -+ ;; -+ * ) -+ if test -f ${srcdir}/config/$f -+ then -+ tmake_file_="${tmake_file_} \$(srcdir)/config/$f" -+ fi -+ ;; -+ esac - done - tmake_file="${tmake_file_}" - -@@ -1916,6 +1926,10 @@ tm_file_list="options.h" - tm_include_list="options.h insn-constants.h" - for f in $tm_file; do - case $f in -+ */linux64.h ) -+ tm_file_list="${tm_file_list} ./config/$f" -+ tm_include_list="${tm_include_list} ./config/$f" -+ ;; - ./* ) - f=`echo $f | sed 's/^..//'` - tm_file_list="${tm_file_list} $f" --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0018-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0018-Avoid-using-libdir-from-.la-which-usually-points-to-.patch deleted file mode 100644 index 20e77d6ea..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0018-Avoid-using-libdir-from-.la-which-usually-points-to-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 27cca95dcfeead8c52d292c4824ee96f178d6183 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 20 Feb 2015 09:39:38 +0000 -Subject: [PATCH 18/40] Avoid using libdir from .la which usually points to a - host path - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Jonathan Liu <net147@gmail.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - ltmain.sh | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/ltmain.sh b/ltmain.sh -index 0121fba707f..52bdbdb5f9c 100644 ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -5628,6 +5628,9 @@ func_mode_link () - absdir="$abs_ladir" - libdir="$abs_ladir" - else -+ # Instead of using libdir from .la which usually points to a host path, -+ # use the path the .la is contained in. -+ libdir="$abs_ladir" - dir="$libdir" - absdir="$libdir" - fi --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0019-export-CPP.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0019-export-CPP.patch deleted file mode 100644 index 140c67a48..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0019-export-CPP.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a2936382da81aefa9b69c1fc625f6c706b7ea1d8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 20 Feb 2015 09:40:59 +0000 -Subject: [PATCH 19/40] export CPP - -The OE environment sets and exports CPP as being the target gcc. When -building gcc-cross-canadian for a mingw targetted sdk, the following can be found -in build.x86_64-pokysdk-mingw32.i586-poky-linux/build-x86_64-linux/libiberty/config.log: - -configure:3641: checking for _FILE_OFFSET_BITS value needed for large files -configure:3666: gcc -c -isystem/media/build1/poky/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe conftest.c >&5 -configure:3666: $? = 0 -configure:3698: result: no -configure:3786: checking how to run the C preprocessor -configure:3856: result: x86_64-pokysdk-mingw32-gcc -E --sysroot=/media/build1/poky/build/tmp/sysroots/x86_64-nativesdk-mingw32-pokysdk-mingw32 -configure:3876: x86_64-pokysdk-mingw32-gcc -E --sysroot=/media/build1/poky/build/tmp/sysroots/x86_64-nativesdk-mingw32-pokysdk-mingw32 conftest.c -configure:3876: $? = 0 - -Note this is a *build* target (in build-x86_64-linux) so it should be -using the host "gcc", not x86_64-pokysdk-mingw32-gcc. Since the mingw32 -headers are very different, using the wrong cpp is a real problem. It is leaking -into configure through the CPP variable. Ultimately this leads to build -failures related to not being able to include a process.h file for pem-unix.c. - -The fix is to ensure we export a sane CPP value into the build -environment when using build targets. We could define a CPP_FOR_BUILD value which may be -the version which needs to be upstreamed but for now, this fix is good enough to -avoid the problem. - -RP 22/08/2013 - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Makefile.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.in b/Makefile.in -index 38774f542a6..b426d4f9350 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -149,6 +149,7 @@ BUILD_EXPORTS = \ - AR="$(AR_FOR_BUILD)"; export AR; \ - AS="$(AS_FOR_BUILD)"; export AS; \ - CC="$(CC_FOR_BUILD)"; export CC; \ -+ CPP="$(CC_FOR_BUILD) -E"; export CPP; \ - CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \ - CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ - CXX="$(CXX_FOR_BUILD)"; export CXX; \ --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0020-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0020-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch deleted file mode 100644 index b22557eaf..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0020-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d4326ab74a362b0fc83ed866f82c359389a36adc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 20 Feb 2015 10:21:55 +0000 -Subject: [PATCH 20/40] Disable the MULTILIB_OSDIRNAMES and other multilib - options. - -Hard coding the MULTILIB_OSDIRNAMES with ../lib64 is causing problems on -systems where the libdir is NOT set to /lib64. This is allowed by the -ABI, as -long as the dynamic loader is present in /lib. - -We simply want to use the default rules in gcc to find and configure the -normal libdir. - -Upstream-Status: Inappropriate[OE-Specific] - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gcc/config/aarch64/t-aarch64-linux | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux -index b9897785a89..7d06f0d0edb 100644 ---- a/gcc/config/aarch64/t-aarch64-linux -+++ b/gcc/config/aarch64/t-aarch64-linux -@@ -21,8 +21,8 @@ - LIB1ASMSRC = aarch64/lib1funcs.asm - LIB1ASMFUNCS = _aarch64_sync_cache_range - --AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be) --MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) --MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) -+#AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be) -+#MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) -+#MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) - --MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) -+#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0021-Ensure-target-gcc-headers-can-be-included.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0021-Ensure-target-gcc-headers-can-be-included.patch deleted file mode 100644 index 58b4d1aa6..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0021-Ensure-target-gcc-headers-can-be-included.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 94cc995cee76a9d59204a900fcaa2afb2eaa75c2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 20 Feb 2015 10:25:11 +0000 -Subject: [PATCH 21/40] Ensure target gcc headers can be included - -There are a few headers installed as part of the OpenEmbedded -gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe -built for the target architecture, these are within the target -sysroot and not cross/nativesdk; thus they weren't able to be -found by gcc with the existing search paths. Add support for -picking up these headers under the sysroot supplied on the gcc -command line in order to resolve this. - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gcc/Makefile.in | 2 ++ - gcc/cppdefault.c | 4 ++++ - gcc/defaults.h | 9 +++++++++ - gcc/gcc.c | 7 ------- - 4 files changed, 15 insertions(+), 7 deletions(-) - -diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 71a8275c39f..aa4adc3db24 100644 ---- a/gcc/Makefile.in -+++ b/gcc/Makefile.in -@@ -614,6 +614,7 @@ libexecdir = @libexecdir@ - - # Directory in which the compiler finds libraries etc. - libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) -+libsubdir_target = $(target_noncanonical)/$(version) - # Directory in which the compiler finds executables - libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) - # Directory in which all plugin resources are installed -@@ -2870,6 +2871,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" - - PREPROCESSOR_DEFINES = \ - -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ -+ -DGCC_INCLUDE_SUBDIR_TARGET=\"$(libsubdir_target)/include\" \ - -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ - -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ - -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ -diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c -index b36a979d5ba..e2e187dedaf 100644 ---- a/gcc/cppdefault.c -+++ b/gcc/cppdefault.c -@@ -59,6 +59,10 @@ const struct default_include cpp_include_defaults[] - /* This is the dir for gcc's private headers. */ - { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, - #endif -+#ifdef GCC_INCLUDE_SUBDIR_TARGET -+ /* This is the dir for gcc's private headers under the specified sysroot. */ -+ { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0 }, -+#endif - #ifdef LOCAL_INCLUDE_DIR - /* /usr/local/include comes before the fixincluded header files. */ - { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, -diff --git a/gcc/defaults.h b/gcc/defaults.h -index 9035b333be8..5982bbda61d 100644 ---- a/gcc/defaults.h -+++ b/gcc/defaults.h -@@ -1455,4 +1455,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - #define DWARF_GNAT_ENCODINGS_DEFAULT DWARF_GNAT_ENCODINGS_GDB - #endif - -+/* Default prefixes to attach to command names. */ -+ -+#ifndef STANDARD_STARTFILE_PREFIX_1 -+#define STANDARD_STARTFILE_PREFIX_1 "/lib/" -+#endif -+#ifndef STANDARD_STARTFILE_PREFIX_2 -+#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" -+#endif -+ - #endif /* ! GCC_DEFAULTS_H */ -diff --git a/gcc/gcc.c b/gcc/gcc.c -index 570cdc00034..3fb64d453f1 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -1464,13 +1464,6 @@ static const char *gcc_libexec_prefix; - - /* Default prefixes to attach to command names. */ - --#ifndef STANDARD_STARTFILE_PREFIX_1 --#define STANDARD_STARTFILE_PREFIX_1 "/lib/" --#endif --#ifndef STANDARD_STARTFILE_PREFIX_2 --#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" --#endif -- - #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ - #undef MD_EXEC_PREFIX - #undef MD_STARTFILE_PREFIX --- -2.22.1 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0022-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0022-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch deleted file mode 100644 index 6f0d3f11d..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0022-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch +++ /dev/null @@ -1,54 +0,0 @@ -From bc192f0a07ad819dee93446c5ef6895d9550d92d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 20 Feb 2015 11:17:19 +0000 -Subject: [PATCH 22/40] gcc 4.8+ won't build with --disable-dependency-tracking - -since the *.Ppo files don't get created unless --enable-dependency-tracking is true. - -This patch ensures we only use those compiler options when its enabled. - -Upstream-Status: Submitted - -(Problem was already reported upstream, attached this patch there -http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55930) - -RP -2012/09/22 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libatomic/Makefile.am | 3 ++- - libatomic/Makefile.in | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am -index 803b292cce5..b47842eb590 100644 ---- a/libatomic/Makefile.am -+++ b/libatomic/Makefile.am -@@ -101,7 +101,8 @@ PAT_S = $(word 3,$(PAT_SPLIT)) - IFUNC_DEF = -DIFUNC_ALT=$(PAT_S) - IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS)) - --M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo -+@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo -+@AMDEP_FALSE@M_DEPS = - M_SIZE = -DN=$(PAT_N) - M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT)) - M_FILE = $(PAT_BASE)_n.c -diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in -index c8f38be5835..4fab7cec3ea 100644 ---- a/libatomic/Makefile.in -+++ b/libatomic/Makefile.in -@@ -335,7 +335,8 @@ PAT_N = $(word 2,$(PAT_SPLIT)) - PAT_S = $(word 3,$(PAT_SPLIT)) - IFUNC_DEF = -DIFUNC_ALT=$(PAT_S) - IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS)) --M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo -+@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo -+@AMDEP_FALSE@M_DEPS = - M_SIZE = -DN=$(PAT_N) - M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT)) - M_FILE = $(PAT_BASE)_n.c --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0023-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0023-Don-t-search-host-directory-during-relink-if-inst_pr.patch deleted file mode 100644 index fe3f3436f..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0023-Don-t-search-host-directory-during-relink-if-inst_pr.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0409d2dd7322ecbed731cbe29b034fea43c5dddc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 3 Mar 2015 08:21:19 +0000 -Subject: [PATCH 23/40] Don't search host directory during "relink" if - $inst_prefix is provided - -http://lists.gnu.org/archive/html/libtool-patches/2011-01/msg00026.html - -Upstream-Status: Submitted - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - ltmain.sh | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/ltmain.sh b/ltmain.sh -index 52bdbdb5f9c..82bcec39f05 100644 ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -6004,12 +6004,13 @@ func_mode_link () - fi - else - # We cannot seem to hardcode it, guess we'll fake it. -+ # Default if $libdir is not relative to the prefix: - add_dir="-L$libdir" -- # Try looking first in the location we're being installed to. -+ - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ add_dir="-L$inst_prefix_dir$libdir" - ;; - esac - fi --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0024-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0024-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch deleted file mode 100644 index c388a0ad0..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0024-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 56e2e1fc2a27c4a5cc9b471d5d0af90bcb871bfa Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 28 Apr 2015 23:15:27 -0700 -Subject: [PATCH 24/40] Use SYSTEMLIBS_DIR replacement instead of hardcoding base_libdir - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gcc/config/aarch64/aarch64-linux.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h -index bf1327e98cc..64436183bc8 100644 ---- a/gcc/config/aarch64/aarch64-linux.h -+++ b/gcc/config/aarch64/aarch64-linux.h -@@ -21,7 +21,7 @@ - #ifndef GCC_AARCH64_LINUX_H - #define GCC_AARCH64_LINUX_H - --#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" -+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" - - #undef MUSL_DYNAMIC_LINKER - #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0025-aarch64-Add-support-for-musl-ldso.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0025-aarch64-Add-support-for-musl-ldso.patch deleted file mode 100644 index 03f9725b8..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0025-aarch64-Add-support-for-musl-ldso.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b142e77e44e1acece6da54ccdc24c4da89cf4b99 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 28 Apr 2015 23:18:39 -0700 -Subject: [PATCH 25/40] aarch64: Add support for musl ldso - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gcc/config/aarch64/aarch64-linux.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h -index 64436183bc8..ba156676026 100644 ---- a/gcc/config/aarch64/aarch64-linux.h -+++ b/gcc/config/aarch64/aarch64-linux.h -@@ -24,7 +24,7 @@ - #define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" - - #undef MUSL_DYNAMIC_LINKER --#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" -+#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" - - #undef ASAN_CC1_SPEC - #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0026-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0026-libcc1-fix-libcc1-s-install-path-and-rpath.patch deleted file mode 100644 index 859173896..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0026-libcc1-fix-libcc1-s-install-path-and-rpath.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 3d4e53fc7cd71ce1181af8a5e9655398857af741 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Sun, 5 Jul 2015 20:25:18 -0700 -Subject: [PATCH 26/40] libcc1: fix libcc1's install path and rpath - -* Install libcc1.so and libcc1plugin.so into - $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version), as what we - had done to lto-plugin. -* Fix bad RPATH iussue: - gcc-5.2.0: package gcc-plugins contains bad RPATH /patht/to/tmp/sysroots/qemux86-64/usr/lib64/../lib64 in file - /path/to/gcc/5.2.0-r0/packages-split/gcc-plugins/usr/lib64/gcc/x86_64-poky-linux/5.2.0/plugin/libcc1plugin.so.0.0.0 - [rpaths] - -Upstream-Status: Inappropriate [OE configuration] - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - libcc1/Makefile.am | 4 ++-- - libcc1/Makefile.in | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am -index 6ecb66b4365..634cce3c2a9 100644 ---- a/libcc1/Makefile.am -+++ b/libcc1/Makefile.am -@@ -37,8 +37,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \ - $(Wc)$(libiberty_normal))) - libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty)) - --plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin --cc1libdir = $(libdir)/$(libsuffix) -+cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) -+plugindir = $(cc1libdir) - - if ENABLE_PLUGIN - plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la -diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in -index 47be10025ad..8d5481d87bd 100644 ---- a/libcc1/Makefile.in -+++ b/libcc1/Makefile.in -@@ -303,8 +303,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \ - $(Wc)$(libiberty_normal))) - - libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty)) --plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin --cc1libdir = $(libdir)/$(libsuffix) -+cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) -+plugindir = $(cc1libdir) - @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la - @ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la - shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \ --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0027-handle-sysroot-support-for-nativesdk-gcc.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0027-handle-sysroot-support-for-nativesdk-gcc.patch deleted file mode 100644 index 4b955de8a..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0027-handle-sysroot-support-for-nativesdk-gcc.patch +++ /dev/null @@ -1,213 +0,0 @@ -From c033c1df11b692213d03db91d6cc145b4adedfac Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 7 Dec 2015 23:39:54 +0000 -Subject: [PATCH 27/40] handle sysroot support for nativesdk-gcc - -Being able to build a nativesdk gcc is useful, particularly in cases -where the host compiler may be of an incompatible version (or a 32 -bit compiler is needed). - -Sadly, building nativesdk-gcc is not straight forward. We install -nativesdk-gcc into a relocatable location and this means that its -library locations can change. "Normal" sysroot support doesn't help -in this case since the values of paths like "libdir" change, not just -base root directory of the system. - -In order to handle this we do two things: - -a) Add %r into spec file markup which can be used for injected paths - such as SYSTEMLIBS_DIR (see gcc_multilib_setup()). -b) Add other paths which need relocation into a .gccrelocprefix section - which the relocation code will notice and adjust automatically. - -Upstream-Status: Inappropriate -RP 2015/7/28 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gcc/cppdefault.c | 50 +++++++++++++++++++++++++++++++++++------------- - gcc/cppdefault.h | 3 ++- - gcc/gcc.c | 20 +++++++++++++------ - 3 files changed, 53 insertions(+), 20 deletions(-) - -diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c -index e2e187dedaf..2faba2b1d63 100644 ---- a/gcc/cppdefault.c -+++ b/gcc/cppdefault.c -@@ -35,6 +35,30 @@ - # undef CROSS_INCLUDE_DIR - #endif - -+static char GPLUSPLUS_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GPLUSPLUS_INCLUDE_DIR; -+static char GCC_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GCC_INCLUDE_DIR; -+static char GPLUSPLUS_TOOL_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GPLUSPLUS_TOOL_INCLUDE_DIR; -+static char GPLUSPLUS_BACKWARD_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GPLUSPLUS_BACKWARD_INCLUDE_DIR; -+static char STANDARD_STARTFILE_PREFIX_2VAR[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET; -+#ifdef LOCAL_INCLUDE_DIR -+static char LOCAL_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = LOCAL_INCLUDE_DIR; -+#endif -+#ifdef PREFIX_INCLUDE_DIR -+static char PREFIX_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = PREFIX_INCLUDE_DIR; -+#endif -+#ifdef FIXED_INCLUDE_DIR -+static char FIXED_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = FIXED_INCLUDE_DIR; -+#endif -+#ifdef CROSS_INCLUDE_DIR -+static char CROSS_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = CROSS_INCLUDE_DIR; -+#endif -+#ifdef TOOL_INCLUDE_DIR -+static char TOOL_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = TOOL_INCLUDE_DIR; -+#endif -+#ifdef NATIVE_SYSTEM_HEADER_DIR -+static char NATIVE_SYSTEM_HEADER_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = NATIVE_SYSTEM_HEADER_DIR; -+#endif -+ - const struct default_include cpp_include_defaults[] - #ifdef INCLUDE_DEFAULTS - = INCLUDE_DEFAULTS; -@@ -42,38 +66,38 @@ const struct default_include cpp_include_defaults[] - = { - #ifdef GPLUSPLUS_INCLUDE_DIR - /* Pick up GNU C++ generic include files. */ -- { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, -+ { GPLUSPLUS_INCLUDE_DIRVAR, "G++", 1, 1, - GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, - #endif - #ifdef GPLUSPLUS_TOOL_INCLUDE_DIR - /* Pick up GNU C++ target-dependent include files. */ -- { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, -+ { GPLUSPLUS_TOOL_INCLUDE_DIRVAR, "G++", 1, 1, - GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, - #endif - #ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR - /* Pick up GNU C++ backward and deprecated include files. */ -- { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, -+ { GPLUSPLUS_BACKWARD_INCLUDE_DIRVAR, "G++", 1, 1, - GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, - #endif - #ifdef GCC_INCLUDE_DIR - /* This is the dir for gcc's private headers. */ -- { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, -+ { GCC_INCLUDE_DIRVAR, "GCC", 0, 0, 0, 0 }, - #endif - #ifdef GCC_INCLUDE_SUBDIR_TARGET - /* This is the dir for gcc's private headers under the specified sysroot. */ -- { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0 }, -+ { STANDARD_STARTFILE_PREFIX_2VAR, "GCC", 0, 0, 1, 0 }, - #endif - #ifdef LOCAL_INCLUDE_DIR - /* /usr/local/include comes before the fixincluded header files. */ -- { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, -- { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, -+ { LOCAL_INCLUDE_DIRVAR, 0, 0, 1, 1, 2 }, -+ { LOCAL_INCLUDE_DIRVAR, 0, 0, 1, 1, 0 }, - #endif - #ifdef PREFIX_INCLUDE_DIR -- { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0 }, -+ { PREFIX_INCLUDE_DIRVAR, 0, 0, 1, 0, 0 }, - #endif - #ifdef FIXED_INCLUDE_DIR - /* This is the dir for fixincludes. */ -- { FIXED_INCLUDE_DIR, "GCC", 0, 0, 0, -+ { FIXED_INCLUDE_DIRVAR, "GCC", 0, 0, 0, - /* A multilib suffix needs adding if different multilibs use - different headers. */ - #ifdef SYSROOT_HEADERS_SUFFIX_SPEC -@@ -85,16 +109,16 @@ const struct default_include cpp_include_defaults[] - #endif - #ifdef CROSS_INCLUDE_DIR - /* One place the target system's headers might be. */ -- { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, -+ { CROSS_INCLUDE_DIRVAR, "GCC", 0, 0, 0, 0 }, - #endif - #ifdef TOOL_INCLUDE_DIR - /* Another place the target system's headers might be. */ -- { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0 }, -+ { TOOL_INCLUDE_DIRVAR, "BINUTILS", 0, 1, 0, 0 }, - #endif - #ifdef NATIVE_SYSTEM_HEADER_DIR - /* /usr/include comes dead last. */ -- { NATIVE_SYSTEM_HEADER_DIR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 2 }, -- { NATIVE_SYSTEM_HEADER_DIR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 0 }, -+ { NATIVE_SYSTEM_HEADER_DIRVAR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 2 }, -+ { NATIVE_SYSTEM_HEADER_DIRVAR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 0 }, - #endif - { 0, 0, 0, 0, 0, 0 } - }; -diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h -index 4a0186d1cf2..29e5d9da0dc 100644 ---- a/gcc/cppdefault.h -+++ b/gcc/cppdefault.h -@@ -33,7 +33,8 @@ - - struct default_include - { -- const char *const fname; /* The name of the directory. */ -+ const char *fname; /* The name of the directory. */ -+ - const char *const component; /* The component containing the directory - (see update_path in prefix.c) */ - const char cplusplus; /* Only look here if we're compiling C++. */ -diff --git a/gcc/gcc.c b/gcc/gcc.c -index 3fb64d453f1..cd0c7fbe961 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -248,6 +248,8 @@ FILE *report_times_to_file = NULL; - #endif - static const char *target_system_root = DEFAULT_TARGET_SYSTEM_ROOT; - -+static char target_relocatable_prefix[4096] __attribute__ ((section (".gccrelocprefix"))) = SYSTEMLIBS_DIR; -+ - /* Nonzero means pass the updated target_system_root to the compiler. */ - - static int target_system_root_changed; -@@ -519,6 +521,7 @@ or with constant text in a single argument. - %G process LIBGCC_SPEC as a spec. - %R Output the concatenation of target_system_root and - target_sysroot_suffix. -+ %r Output the base path target_relocatable_prefix - %S process STARTFILE_SPEC as a spec. A capital S is actually used here. - %E process ENDFILE_SPEC as a spec. A capital E is actually used here. - %C process CPP_SPEC as a spec. -@@ -1487,10 +1490,10 @@ static const char *gcc_libexec_prefix; - gcc_exec_prefix is set because, in that case, we know where the - compiler has been installed, and use paths relative to that - location instead. */ --static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX; --static const char *const standard_libexec_prefix = STANDARD_LIBEXEC_PREFIX; --static const char *const standard_bindir_prefix = STANDARD_BINDIR_PREFIX; --static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; -+static char standard_exec_prefix[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_EXEC_PREFIX; -+static char standard_libexec_prefix[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_LIBEXEC_PREFIX; -+static char standard_bindir_prefix[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_BINDIR_PREFIX; -+static char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; - - /* For native compilers, these are well-known paths containing - components that may be provided by the system. For cross -@@ -1498,9 +1501,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; - static const char *md_exec_prefix = MD_EXEC_PREFIX; - static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; - static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1; --static const char *const standard_startfile_prefix_1 -+static char standard_startfile_prefix_1[4096] __attribute__ ((section (".gccrelocprefix"))) - = STANDARD_STARTFILE_PREFIX_1; --static const char *const standard_startfile_prefix_2 -+static char standard_startfile_prefix_2[4096] __attribute__ ((section (".gccrelocprefix"))) - = STANDARD_STARTFILE_PREFIX_2; - - /* A relative path to be used in finding the location of tools -@@ -5849,6 +5852,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) - } - break; - -+ case 'r': -+ obstack_grow (&obstack, target_relocatable_prefix, -+ strlen (target_relocatable_prefix)); -+ break; -+ - case 'S': - value = do_spec_1 (startfile_spec, 0, NULL); - if (value != 0) --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0028-Search-target-sysroot-gcc-version-specific-dirs-with.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0028-Search-target-sysroot-gcc-version-specific-dirs-with.patch deleted file mode 100644 index 1b25d7808..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0028-Search-target-sysroot-gcc-version-specific-dirs-with.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 62240d4c725ea0b43abfb901ddad90e83e29a25c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 7 Dec 2015 23:41:45 +0000 -Subject: [PATCH 28/40] Search target sysroot gcc version specific dirs with - multilib. - -We install the gcc libraries (such as crtbegin.p) into -<sysroot><libdir>/<target-sys>/5.2.0/ -which is a default search path for GCC (aka multi_suffix in the -code below). <target-sys> is 'machine' in gcc's terminology. We use -these directories so that multiple gcc versions could in theory -co-exist on target. - -We only want to build one gcc-cross-canadian per arch and have this work -for all multilibs. <target-sys> can be handled by mapping the multilib -<target-sys> to the one used by gcc-cross-canadian, e.g. -mips64-polkmllib32-linux -is symlinked to by mips64-poky-linux. - -The default gcc search path in the target sysroot for a "lib64" mutlilib -is: - -<sysroot>/lib32/mips64-poky-linux/5.2.0/ -<sysroot>/lib32/../lib64/ -<sysroot>/usr/lib32/mips64-poky-linux/5.2.0/ -<sysroot>/usr/lib32/../lib64/ -<sysroot>/lib32/ -<sysroot>/usr/lib32/ - -which means that the lib32 crtbegin.o will be found and the lib64 ones -will not which leads to compiler failures. - -This patch injects a multilib version of that path first so the lib64 -binaries can be found first. With this change the search path becomes: - -<sysroot>/lib32/../lib64/mips64-poky-linux/5.2.0/ -<sysroot>/lib32/mips64-poky-linux/5.2.0/ -<sysroot>/lib32/../lib64/ -<sysroot>/usr/lib32/../lib64/mips64-poky-linux/5.2.0/ -<sysroot>/usr/lib32/mips64-poky-linux/5.2.0/ -<sysroot>/usr/lib32/../lib64/ -<sysroot>/lib32/ -<sysroot>/usr/lib32/ - -Upstream-Status: Pending -RP 2015/7/31 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gcc/gcc.c | 29 ++++++++++++++++++++++++++++- - 1 file changed, 28 insertions(+), 1 deletion(-) - -diff --git a/gcc/gcc.c b/gcc/gcc.c -index cd0c7fbe961..f6f3aa077c8 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -2527,7 +2527,7 @@ for_each_path (const struct path_prefix *paths, - if (path == NULL) - { - len = paths->max_len + extra_space + 1; -- len += MAX (MAX (suffix_len, multi_os_dir_len), multiarch_len); -+ len += MAX ((suffix_len + multi_os_dir_len), multiarch_len); - path = XNEWVEC (char, len); - } - -@@ -2539,6 +2539,33 @@ for_each_path (const struct path_prefix *paths, - /* Look first in MACHINE/VERSION subdirectory. */ - if (!skip_multi_dir) - { -+ if (!(pl->os_multilib ? skip_multi_os_dir : skip_multi_dir)) -+ { -+ const char *this_multi; -+ size_t this_multi_len; -+ -+ if (pl->os_multilib) -+ { -+ this_multi = multi_os_dir; -+ this_multi_len = multi_os_dir_len; -+ } -+ else -+ { -+ this_multi = multi_dir; -+ this_multi_len = multi_dir_len; -+ } -+ -+ /* Look in multilib MACHINE/VERSION subdirectory first */ -+ if (this_multi_len) -+ { -+ memcpy (path + len, this_multi, this_multi_len + 1); -+ memcpy (path + len + this_multi_len, multi_suffix, suffix_len + 1); -+ ret = callback (path, callback_info); -+ if (ret) -+ break; -+ } -+ } -+ - memcpy (path + len, multi_suffix, suffix_len + 1); - ret = callback (path, callback_info); - if (ret) --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0029-Fix-various-_FOR_BUILD-and-related-variables.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0029-Fix-various-_FOR_BUILD-and-related-variables.patch deleted file mode 100644 index 0c8bdb17d..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0029-Fix-various-_FOR_BUILD-and-related-variables.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 1377c738e31a1e1599cfab189485a9459f803e79 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 7 Dec 2015 23:42:45 +0000 -Subject: [PATCH 29/40] Fix various _FOR_BUILD and related variables - -When doing a FOR_BUILD thing, you have to override CFLAGS with -CFLAGS_FOR_BUILD. And if you use C++, you also have to override -CXXFLAGS with CXXFLAGS_FOR_BUILD. -Without this, when building for mingw, you end up trying to use -the mingw headers for a host build. - -The same goes for other variables as well, such as CPPFLAGS, -CPP, and GMPINC. - -Upstream-Status: Pending - -Signed-off-by: Peter Seebach <peter.seebach@windriver.com> -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Makefile.in | 6 ++++++ - Makefile.tpl | 5 +++++ - gcc/Makefile.in | 2 +- - gcc/configure | 2 +- - gcc/configure.ac | 2 +- - 5 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index b426d4f9350..a2af9905cce 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -152,6 +152,7 @@ BUILD_EXPORTS = \ - CPP="$(CC_FOR_BUILD) -E"; export CPP; \ - CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \ - CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ -+ CPPFLAGS="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS; \ - CXX="$(CXX_FOR_BUILD)"; export CXX; \ - CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \ - GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \ -@@ -169,6 +170,9 @@ BUILD_EXPORTS = \ - # built for the build system to override those in BASE_FLAGS_TO_PASS. - EXTRA_BUILD_FLAGS = \ - CFLAGS="$(CFLAGS_FOR_BUILD)" \ -+ CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \ -+ CPP="$(CC_FOR_BUILD) -E" \ -+ CPPFLAGS="$(CPPFLAGS_FOR_BUILD)" \ - LDFLAGS="$(LDFLAGS_FOR_BUILD)" - - # This is the list of directories to built for the host system. -@@ -186,6 +190,7 @@ HOST_SUBDIR = @host_subdir@ - HOST_EXPORTS = \ - $(BASE_EXPORTS) \ - CC="$(CC)"; export CC; \ -+ CPP="$(CC) -E"; export CPP; \ - ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \ - CFLAGS="$(CFLAGS)"; export CFLAGS; \ - CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ -@@ -743,6 +748,7 @@ BASE_FLAGS_TO_PASS = \ - "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ - "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ - "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \ -+ "CXXFLAGS_FOR_BUILD=$(CXXFLAGS_FOR_BUILD)" \ - "EXPECT=$(EXPECT)" \ - "FLEX=$(FLEX)" \ - "INSTALL=$(INSTALL)" \ -diff --git a/Makefile.tpl b/Makefile.tpl -index 1f23b79b4b2..6c5652e811d 100644 ---- a/Makefile.tpl -+++ b/Makefile.tpl -@@ -154,6 +154,7 @@ BUILD_EXPORTS = \ - CC="$(CC_FOR_BUILD)"; export CC; \ - CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \ - CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ -+ CPPFLAGS="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS; \ - CXX="$(CXX_FOR_BUILD)"; export CXX; \ - CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \ - GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \ -@@ -171,6 +172,9 @@ BUILD_EXPORTS = \ - # built for the build system to override those in BASE_FLAGS_TO_PASS. - EXTRA_BUILD_FLAGS = \ - CFLAGS="$(CFLAGS_FOR_BUILD)" \ -+ CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \ -+ CPP="$(CC_FOR_BUILD) -E" \ -+ CPPFLAGS="$(CPPFLAGS_FOR_BUILD)" \ - LDFLAGS="$(LDFLAGS_FOR_BUILD)" - - # This is the list of directories to built for the host system. -@@ -188,6 +192,7 @@ HOST_SUBDIR = @host_subdir@ - HOST_EXPORTS = \ - $(BASE_EXPORTS) \ - CC="$(CC)"; export CC; \ -+ CPP="$(CC) -E"; export CPP; \ - ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \ - CFLAGS="$(CFLAGS)"; export CFLAGS; \ - CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ -diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 5ae693fb06c..02ee0aa72f4 100644 ---- a/gcc/Makefile.in -+++ b/gcc/Makefile.in -@@ -801,7 +801,7 @@ BUILD_LDFLAGS=@BUILD_LDFLAGS@ - BUILD_NO_PIE_FLAG = @BUILD_NO_PIE_FLAG@ - BUILD_LDFLAGS += $(BUILD_NO_PIE_FLAG) - BUILD_CPPFLAGS= -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \ -- -I$(srcdir)/../include @INCINTL@ $(CPPINC) $(CPPFLAGS) -+ -I$(srcdir)/../include @INCINTL@ $(CPPINC) $(CPPFLAGS_FOR_BUILD) - - # Actual name to use when installing a native compiler. - GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)') -diff --git a/gcc/configure b/gcc/configure -index 3d9dcbdc93d..aa127a4f6a4 100755 ---- a/gcc/configure -+++ b/gcc/configure -@@ -11797,7 +11797,7 @@ else - CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ - CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \ - LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \ -- GMPINC="" CPPFLAGS="${CPPFLAGS} -DGENERATOR_FILE" \ -+ GMPINC="" CPPFLAGS="${CPPFLAGS_FOR_BUILD} -DGENERATOR_FILE" \ - ${realsrcdir}/configure \ - --enable-languages=${enable_languages-all} \ - --target=$target_alias --host=$build_alias --build=$build_alias -diff --git a/gcc/configure.ac b/gcc/configure.ac -index e09c840b605..18bf53c7e0a 100644 ---- a/gcc/configure.ac -+++ b/gcc/configure.ac -@@ -1708,7 +1708,7 @@ else - CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ - CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \ - LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \ -- GMPINC="" CPPFLAGS="${CPPFLAGS} -DGENERATOR_FILE" \ -+ GMPINC="" CPPFLAGS="${CPPFLAGS_FOR_BUILD} -DGENERATOR_FILE" \ - ${realsrcdir}/configure \ - --enable-languages=${enable_languages-all} \ - --target=$target_alias --host=$build_alias --build=$build_alias --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0030-nios2-Define-MUSL_DYNAMIC_LINKER.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0030-nios2-Define-MUSL_DYNAMIC_LINKER.patch deleted file mode 100644 index 04e126c5c..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0030-nios2-Define-MUSL_DYNAMIC_LINKER.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 75da3cc9ca2d3de8c2062f23bf4f72415741ef83 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 2 Feb 2016 10:26:10 -0800 -Subject: [PATCH 30/40] nios2: Define MUSL_DYNAMIC_LINKER - -Upstream-Status: Pending - -Signed-off-by: Marek Vasut <marex@denx.de> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gcc/config/nios2/linux.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gcc/config/nios2/linux.h b/gcc/config/nios2/linux.h -index 4729105626d..36181eb7b85 100644 ---- a/gcc/config/nios2/linux.h -+++ b/gcc/config/nios2/linux.h -@@ -30,6 +30,7 @@ - #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-nios2.so.1" -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-nios2.so.1" - - #undef LINK_SPEC - #define LINK_SPEC LINK_SPEC_ENDIAN \ --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0031-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0031-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch deleted file mode 100644 index 002cf2bec..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0031-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch +++ /dev/null @@ -1,87 +0,0 @@ -From f715aeef294b85fa593ef69e6d0114cc7b15312b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 27 Jun 2017 18:10:54 -0700 -Subject: [PATCH 31/40] Add ssp_nonshared to link commandline for musl targets - -when -fstack-protector options are enabled we need to -link with ssp_shared on musl since it does not provide -the __stack_chk_fail_local() so essentially it provides -libssp but not libssp_nonshared something like -TARGET_LIBC_PROVIDES_SSP_BUT_NOT_SSP_NONSHARED - where-as for glibc the needed symbols -are already present in libc_nonshared library therefore -we do not need any library helper on glibc based systems -but musl needs the libssp_noshared from gcc - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gcc/config/linux.h | 7 +++++++ - gcc/config/rs6000/linux.h | 10 ++++++++++ - gcc/config/rs6000/linux64.h | 10 ++++++++++ - 3 files changed, 27 insertions(+) - -diff --git a/gcc/config/linux.h b/gcc/config/linux.h -index 487b0c0923b..4769d089538 100644 ---- a/gcc/config/linux.h -+++ b/gcc/config/linux.h -@@ -182,6 +182,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ - { 0, 0, 0, 0, 0, 0 } \ - } -+#ifdef TARGET_LIBC_PROVIDES_SSP -+#undef LINK_SSP_SPEC -+#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ -+ "|fstack-protector-strong|fstack-protector-explicit" \ -+ ":-lssp_nonshared}" -+#endif -+ - #endif - - #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ -diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h -index 01b40c762f6..e7c5e92215c 100644 ---- a/gcc/config/rs6000/linux.h -+++ b/gcc/config/rs6000/linux.h -@@ -92,6 +92,16 @@ - " -m elf32ppclinux") - #endif - -+/* link libssp_nonshared.a with musl */ -+#if DEFAULT_LIBC == LIBC_MUSL -+#ifdef TARGET_LIBC_PROVIDES_SSP -+#undef LINK_SSP_SPEC -+#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ -+ "|fstack-protector-strong|fstack-protector-explicit" \ -+ ":-lssp_nonshared}" -+#endif -+#endif -+ - #undef LINK_OS_LINUX_SPEC - #define LINK_OS_LINUX_SPEC LINK_OS_LINUX_EMUL " %{!shared: %{!static: \ - %{!static-pie: \ -diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h -index 54aa8d957e7..619e113e2b8 100644 ---- a/gcc/config/rs6000/linux64.h -+++ b/gcc/config/rs6000/linux64.h -@@ -466,6 +466,16 @@ extern int dot_symbols; - " -m elf64ppc") - #endif - -+/* link libssp_nonshared.a with musl */ -+#if DEFAULT_LIBC == LIBC_MUSL -+#ifdef TARGET_LIBC_PROVIDES_SSP -+#undef LINK_SSP_SPEC -+#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ -+ "|fstack-protector-strong|fstack-protector-explicit" \ -+ ":-lssp_nonshared}" -+#endif -+#endif -+ - #define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \ - %{!static-pie: \ - %{rdynamic:-export-dynamic} \ --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0032-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0032-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch deleted file mode 100644 index 025caba31..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0032-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 6dfbca78b8d253aecf9cbb5e68e04b8dd3d6a543 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Apr 2016 20:03:28 +0000 -Subject: [PATCH 32/40] libgcc: Add knob to use ldbl-128 on ppc - -musl does not support ldbl 128 so we can not assume -that linux as a whole supports ldbl-128 bits, instead -act upon configure option passed to gcc and assume no -on musl and yes otherwise if no option is passed since -default behaviour is to assume ldbl128 it does not -change the defaults - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libgcc/Makefile.in | 1 + - libgcc/config/rs6000/t-linux | 5 ++++- - libgcc/configure | 18 ++++++++++++++++++ - libgcc/configure.ac | 12 ++++++++++++ - 4 files changed, 35 insertions(+), 1 deletion(-) - mode change 100644 => 100755 libgcc/configure - -diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in -index dd8cee99fd3..b5f478af382 100644 ---- a/libgcc/Makefile.in -+++ b/libgcc/Makefile.in -@@ -48,6 +48,7 @@ unwind_header = @unwind_header@ - md_unwind_header = @md_unwind_header@ - sfp_machine_header = @sfp_machine_header@ - thread_header = @thread_header@ -+with_ldbl128 = @with_ldbl128@ - - host_noncanonical = @host_noncanonical@ - real_host_noncanonical = @real_host_noncanonical@ -diff --git a/libgcc/config/rs6000/t-linux b/libgcc/config/rs6000/t-linux -index 4f6d4c4a4d2..c50dd94a2da 100644 ---- a/libgcc/config/rs6000/t-linux -+++ b/libgcc/config/rs6000/t-linux -@@ -1,3 +1,6 @@ - SHLIB_MAPFILES += $(srcdir)/config/rs6000/libgcc-glibc.ver - --HOST_LIBGCC2_CFLAGS += -mlong-double-128 -mno-minimal-toc -+ifeq ($(with_ldbl128),yes) -+HOST_LIBGCC2_CFLAGS += -mlong-double-128 -+endif -+HOST_LIBGCC2_CFLAGS += -mno-minimal-toc -diff --git a/libgcc/configure b/libgcc/configure -old mode 100644 -new mode 100755 -index b2f3f870844..ed806587c17 ---- a/libgcc/configure -+++ b/libgcc/configure -@@ -619,6 +619,7 @@ build_vendor - build_cpu - build - with_aix_soname -+with_ldbl128 - enable_vtable_verify - enable_shared - libgcc_topdir -@@ -668,6 +669,7 @@ with_cross_host - with_ld - enable_shared - enable_vtable_verify -+with_long_double_128 - with_aix_soname - enable_version_specific_runtime_libs - with_slibdir -@@ -1329,6 +1331,7 @@ Optional Packages: - --with-target-subdir=SUBDIR Configuring in a subdirectory for target - --with-cross-host=HOST Configuring with a cross compiler - --with-ld arrange to use the specified ld (full pathname) -+ --with-long-double-128 use 128-bit long double by default - --with-aix-soname=aix|svr4|both - shared library versioning (aka "SONAME") variant to - provide on AIX -@@ -2213,6 +2216,21 @@ fi - - - -+# Check whether --with-long-double-128 was given. -+if test "${with_long_double_128+set}" = set; then : -+ withval=$with_long_double_128; with_ldbl128="$with_long_double_128" -+else -+ case "${host}" in -+ power*-*-musl*) -+ with_ldbl128="no";; -+ *) with_ldbl128="yes";; -+ esac -+ -+fi -+ -+ -+ -+ - # Check whether --with-aix-soname was given. - if test "${with_aix_soname+set}" = set; then : - withval=$with_aix_soname; case "${host}:${enable_shared}" in -diff --git a/libgcc/configure.ac b/libgcc/configure.ac -index b59aa746afc..42220a263c5 100644 ---- a/libgcc/configure.ac -+++ b/libgcc/configure.ac -@@ -78,6 +78,18 @@ AC_ARG_ENABLE(vtable-verify, - [enable_vtable_verify=no]) - AC_SUBST(enable_vtable_verify) - -+AC_ARG_WITH(long-double-128, -+[AS_HELP_STRING([--with-long-double-128], -+ [use 128-bit long double by default])], -+ with_ldbl128="$with_long_double_128", -+[case "${host}" in -+ power*-*-musl*) -+ with_ldbl128="no";; -+ *) with_ldbl128="yes";; -+ esac -+]) -+AC_SUBST(with_ldbl128) -+ - AC_ARG_WITH(aix-soname, - [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], - [shared library versioning (aka "SONAME") variant to provide on AIX])], --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0033-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0033-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch deleted file mode 100644 index 343f7aad1..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0033-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7e55147e8e609ace6f9eecd86a956636687671f0 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 4 May 2016 21:11:34 -0700 -Subject: [PATCH 33/40] Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS - -Upstream-Status: Pending - -Signed-off-by: Christopher Larson <chris_larson@mentor.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libgcc/config/t-slibgcc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgcc/config/t-slibgcc b/libgcc/config/t-slibgcc -index 7e60b621a2d..ea22ede3361 100644 ---- a/libgcc/config/t-slibgcc -+++ b/libgcc/config/t-slibgcc -@@ -32,7 +32,7 @@ SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \ - $(DESTDIR)$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) - - SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ -- $(SHLIB_LDFLAGS) \ -+ $(LDFLAGS) $(SHLIB_LDFLAGS) \ - -o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ \ - $(SHLIB_OBJS) $(SHLIB_LC) && \ - rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \ --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch deleted file mode 100644 index 92224cc56..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 46ca51dd413330bb8425b06283e7667bfb507c3d Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy <nsz@port70.net> -Date: Sat, 24 Oct 2015 20:09:53 +0000 -Subject: [PATCH 34/40] libgcc_s: Use alias for __cpu_indicator_init instead of symver - -Adapter from - -https://gcc.gnu.org/ml/gcc-patches/2015-05/msg00899.html - -This fix was debated but hasnt been applied gcc upstream since -they expect musl to support '@' in symbol versioning which is -a sun/gnu versioning extention. This patch however avoids the -need for the '@' symbols at all - -libgcc/Changelog: - -2015-05-11 Szabolcs Nagy <szabolcs.nagy@arm.com> - - * config/i386/cpuinfo.c (__cpu_indicator_init_local): Add. - (__cpu_indicator_init@GCC_4.8.0, __cpu_model@GCC_4.8.0): Remove. - - * config/i386/t-linux (HOST_LIBGCC2_CFLAGS): Remove -DUSE_ELF_SYMVER. - -gcc/Changelog: - -2015-05-11 Szabolcs Nagy <szabolcs.nagy@arm.com> - - * config/i386/i386.c (ix86_expand_builtin): Make __builtin_cpu_init - call __cpu_indicator_init_local instead of __cpu_indicator_init. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gcc/config/i386/i386.c | 4 ++-- - libgcc/config/i386/cpuinfo.c | 6 +++--- - libgcc/config/i386/t-linux | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c -index a88a29b51e6..6f3f5187970 100644 ---- a/gcc/config/i386/i386.c -+++ b/gcc/config/i386/i386.c -@@ -36555,10 +36555,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, - { - case IX86_BUILTIN_CPU_INIT: - { -- /* Make it call __cpu_indicator_init in libgcc. */ -+ /* Make it call __cpu_indicator_init_local in libgcc.a. */ - tree call_expr, fndecl, type; - type = build_function_type_list (integer_type_node, NULL_TREE); -- fndecl = build_fn_decl ("__cpu_indicator_init", type); -+ fndecl = build_fn_decl ("__cpu_indicator_init_local", type); - call_expr = build_call_expr (fndecl, 0); - return expand_expr (call_expr, target, mode, EXPAND_NORMAL); - } -diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c -index d1853d5515b..864150c9249 100644 ---- a/libgcc/config/i386/cpuinfo.c -+++ b/libgcc/config/i386/cpuinfo.c -@@ -485,7 +485,7 @@ __cpu_indicator_init (void) - return 0; - } - --#if defined SHARED && defined USE_ELF_SYMVER --__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0"); --__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0"); -+#ifndef SHARED -+int __cpu_indicator_init_local (void) -+ __attribute__ ((weak, alias ("__cpu_indicator_init"))); - #endif -diff --git a/libgcc/config/i386/t-linux b/libgcc/config/i386/t-linux -index 8506a635790..564296f788e 100644 ---- a/libgcc/config/i386/t-linux -+++ b/libgcc/config/i386/t-linux -@@ -3,5 +3,5 @@ - # t-slibgcc-elf-ver and t-linux - SHLIB_MAPFILES = libgcc-std.ver $(srcdir)/config/i386/libgcc-glibc.ver - --HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER $(CET_FLAGS) -+HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS) - CRTSTUFF_T_CFLAGS += $(CET_FLAGS) --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0035-sync-gcc-stddef.h-with-musl.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0035-sync-gcc-stddef.h-with-musl.patch deleted file mode 100644 index 6ecd6e972..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0035-sync-gcc-stddef.h-with-musl.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 38d401fb6ab555d09f4a9a677721dde0743876e1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 3 Feb 2017 12:56:00 -0800 -Subject: [PATCH 35/40] sync gcc stddef.h with musl - -musl defines ptrdiff_t size_t and wchar_t -so dont define them here if musl is definining them - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gcc/ginclude/stddef.h | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h -index 31b96a7e5e1..438a3ce7c56 100644 ---- a/gcc/ginclude/stddef.h -+++ b/gcc/ginclude/stddef.h -@@ -134,6 +134,7 @@ _TYPE_wchar_t; - #ifndef ___int_ptrdiff_t_h - #ifndef _GCC_PTRDIFF_T - #ifndef _PTRDIFF_T_DECLARED /* DragonFly */ -+#ifndef __DEFINED_ptrdiff_t /* musl */ - #define _PTRDIFF_T - #define _T_PTRDIFF_ - #define _T_PTRDIFF -@@ -143,10 +144,12 @@ _TYPE_wchar_t; - #define ___int_ptrdiff_t_h - #define _GCC_PTRDIFF_T - #define _PTRDIFF_T_DECLARED -+#define __DEFINED_ptrdiff_t /* musl */ - #ifndef __PTRDIFF_TYPE__ - #define __PTRDIFF_TYPE__ long int - #endif - typedef __PTRDIFF_TYPE__ ptrdiff_t; -+#endif /* __DEFINED_ptrdiff_t */ - #endif /* _PTRDIFF_T_DECLARED */ - #endif /* _GCC_PTRDIFF_T */ - #endif /* ___int_ptrdiff_t_h */ -@@ -184,6 +187,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; - #ifndef _GCC_SIZE_T - #ifndef _SIZET_ - #ifndef __size_t -+#ifndef __DEFINED_size_t /* musl */ - #define __size_t__ /* BeOS */ - #define __SIZE_T__ /* Cray Unicos/Mk */ - #define _SIZE_T -@@ -200,6 +204,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; - #define ___int_size_t_h - #define _GCC_SIZE_T - #define _SIZET_ -+#define __DEFINED_size_t /* musl */ - #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ - || defined(__DragonFly__) \ - || defined(__FreeBSD_kernel__) -@@ -235,6 +240,7 @@ typedef long ssize_t; - #endif /* _SIZE_T */ - #endif /* __SIZE_T__ */ - #endif /* __size_t__ */ -+#endif /* __DEFINED_size_t */ - #undef __need_size_t - #endif /* _STDDEF_H or __need_size_t. */ - -@@ -264,6 +270,7 @@ typedef long ssize_t; - #ifndef ___int_wchar_t_h - #ifndef __INT_WCHAR_T_H - #ifndef _GCC_WCHAR_T -+#ifndef __DEFINED_wchar_t /* musl */ - #define __wchar_t__ /* BeOS */ - #define __WCHAR_T__ /* Cray Unicos/Mk */ - #define _WCHAR_T -@@ -279,6 +286,7 @@ typedef long ssize_t; - #define __INT_WCHAR_T_H - #define _GCC_WCHAR_T - #define _WCHAR_T_DECLARED -+#define __DEFINED_wchar_t /* musl */ - - /* On BSD/386 1.1, at least, machine/ansi.h defines _BSD_WCHAR_T_ - instead of _WCHAR_T_, and _BSD_RUNE_T_ (which, unlike the other -@@ -344,6 +352,7 @@ typedef __WCHAR_TYPE__ wchar_t; - #endif - #endif /* __WCHAR_T__ */ - #endif /* __wchar_t__ */ -+#endif /* __DEFINED_wchar_t musl */ - #undef __need_wchar_t - #endif /* _STDDEF_H or __need_wchar_t. */ - --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0036-fix-segmentation-fault-in-precompiled-header-generat.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0036-fix-segmentation-fault-in-precompiled-header-generat.patch deleted file mode 100644 index c4ce5db55..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0036-fix-segmentation-fault-in-precompiled-header-generat.patch +++ /dev/null @@ -1,60 +0,0 @@ -From a9bb29a4e9b478f9b126e483467ce9031c33fe4f Mon Sep 17 00:00:00 2001 -From: Juro Bystricky <juro.bystricky@intel.com> -Date: Mon, 19 Mar 2018 22:31:20 -0700 -Subject: [PATCH 36/40] fix segmentation fault in precompiled header generation - -Prevent a segmentation fault which occurs when using incorrect -structure trying to access name of some named operators, such as -CPP_NOT, CPP_AND etc. "token->val.node.spelling" cannot be used in -those cases, as is may not be initialized at all. - -[YOCTO #11738] - -Upstream-Status: Pending - -Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libcpp/lex.c | 26 +++++++++++++++++++++----- - 1 file changed, 21 insertions(+), 5 deletions(-) - -diff --git a/libcpp/lex.c b/libcpp/lex.c -index 37c365a3560..63480048db6 100644 ---- a/libcpp/lex.c -+++ b/libcpp/lex.c -@@ -3279,11 +3279,27 @@ cpp_spell_token (cpp_reader *pfile, const cpp_token *token, - spell_ident: - case SPELL_IDENT: - if (forstring) -- { -- memcpy (buffer, NODE_NAME (token->val.node.spelling), -- NODE_LEN (token->val.node.spelling)); -- buffer += NODE_LEN (token->val.node.spelling); -- } -+ { -+ if (token->type == CPP_NAME) -+ { -+ memcpy (buffer, NODE_NAME (token->val.node.spelling), -+ NODE_LEN (token->val.node.spelling)); -+ buffer += NODE_LEN (token->val.node.spelling); -+ break; -+ } -+ /* NAMED_OP, cannot use node.spelling */ -+ if (token->flags & NAMED_OP) -+ { -+ const char *str = cpp_named_operator2name (token->type); -+ if (str) -+ { -+ size_t len = strlen(str); -+ memcpy(buffer, str, len); -+ buffer += len; -+ } -+ break; -+ } -+ } - else - buffer = _cpp_spell_ident_ucns (buffer, token->val.node.node); - break; --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0037-Fix-for-testsuite-failure.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0037-Fix-for-testsuite-failure.patch deleted file mode 100644 index 70999dd45..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0037-Fix-for-testsuite-failure.patch +++ /dev/null @@ -1,258 +0,0 @@ -From 1e5c1ef34d92b4157e1a24ca743d45f3a7375a5e Mon Sep 17 00:00:00 2001 -From: RAGHUNATH LOLUR <raghunath.lolur@kpit.com> -Date: Wed, 6 Dec 2017 22:52:26 -0800 -Subject: [PATCH 37/40] Fix for testsuite failure - -2017-11-16 Raghunath Lolur <raghunath.lolur@kpit.com> - - * gcc.dg/pr56275.c: If SSE is disabled, ensure that - "-mfpmath" is not set to use SSE. Set "-mfpmath=387". - * gcc.dg/pr68306.c: Likewise - * gcc.dg/pr68306-2.c: Likewise - * gcc.dg/pr68306-3.c: Likewise - * gcc.dg/pr69634.c: Likewise - * gcc.target/i386/amd64-abi-1.c: Likewise - * gcc.target/i386/funcspec-6.c: Likewise - * gcc.target/i386/interrupt-387-err-1.c: Likewise - * gcc.target/i386/isa-14.c: Likewise - * gcc.target/i386/pr44948-2b.c: Likewise - * gcc.target/i386/pr53425-1.c: Likewise - * gcc.target/i386/pr53425-2.c: Likewise - * gcc.target/i386/pr55247.c: Likewise - * gcc.target/i386/pr59644.c: Likewise - * gcc.target/i386/pr62120.c: Likewise - * gcc.target/i386/pr70467-1.c: Likewise - * gcc.target/i386/warn-vect-op-1.c: Likewise - -If -Wall, -Werror are used during compilation various test cases fail -to compile. - -If SSE is disabled, be sure to -mfpmath=387 to resolve this. - -This patch removes the changes to Changelog from the original patch. -This will help us avoid conflicts. - -Upstream-Status: Pending - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> ---- - gcc/testsuite/gcc.dg/pr56275.c | 2 +- - gcc/testsuite/gcc.dg/pr68306-2.c | 2 +- - gcc/testsuite/gcc.dg/pr68306-3.c | 2 +- - gcc/testsuite/gcc.dg/pr68306.c | 2 +- - gcc/testsuite/gcc.dg/pr69634.c | 2 +- - gcc/testsuite/gcc.target/i386/amd64-abi-1.c | 2 +- - gcc/testsuite/gcc.target/i386/funcspec-6.c | 1 + - gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c | 2 +- - gcc/testsuite/gcc.target/i386/isa-14.c | 2 +- - gcc/testsuite/gcc.target/i386/pr44948-2b.c | 2 +- - gcc/testsuite/gcc.target/i386/pr53425-1.c | 2 +- - gcc/testsuite/gcc.target/i386/pr53425-2.c | 2 +- - gcc/testsuite/gcc.target/i386/pr55247.c | 2 +- - gcc/testsuite/gcc.target/i386/pr59644.c | 2 +- - gcc/testsuite/gcc.target/i386/pr62120.c | 2 +- - gcc/testsuite/gcc.target/i386/pr70467-1.c | 2 +- - gcc/testsuite/gcc.target/i386/warn-vect-op-1.c | 2 +- - 17 files changed, 17 insertions(+), 16 deletions(-) - -diff --git a/gcc/testsuite/gcc.dg/pr56275.c b/gcc/testsuite/gcc.dg/pr56275.c -index b901bb2b199..a4f6c95e1a1 100644 ---- a/gcc/testsuite/gcc.dg/pr56275.c -+++ b/gcc/testsuite/gcc.dg/pr56275.c -@@ -1,6 +1,6 @@ - /* { dg-do compile } */ - /* { dg-options "-O2" } */ --/* { dg-additional-options "-mno-sse" { target { i?86-*-* x86_64-*-* } } } */ -+/* { dg-additional-options "-mno-sse -mfpmath=387" { target { i?86-*-* x86_64-*-* } } } */ - - typedef long long v2tw __attribute__ ((vector_size (2 * sizeof (long long)))); - -diff --git a/gcc/testsuite/gcc.dg/pr68306-2.c b/gcc/testsuite/gcc.dg/pr68306-2.c -index 4672ebe7987..2a368c484b6 100644 ---- a/gcc/testsuite/gcc.dg/pr68306-2.c -+++ b/gcc/testsuite/gcc.dg/pr68306-2.c -@@ -1,6 +1,6 @@ - /* { dg-do compile } */ - /* { dg-options "-O3" } */ --/* { dg-additional-options "-mno-sse -mno-mmx" { target i?86-*-* x86_64-*-* } } */ -+/* { dg-additional-options "-mno-sse -mno-mmx -mfpmath=387" { target i?86-*-* x86_64-*-* } } */ - - struct { - int tz_minuteswest; -diff --git a/gcc/testsuite/gcc.dg/pr68306-3.c b/gcc/testsuite/gcc.dg/pr68306-3.c -index f5a8c102cf8..df3390c64c2 100644 ---- a/gcc/testsuite/gcc.dg/pr68306-3.c -+++ b/gcc/testsuite/gcc.dg/pr68306-3.c -@@ -1,6 +1,6 @@ - /* { dg-do compile } */ - /* { dg-options "-O3" } */ --/* { dg-additional-options "-mno-sse -mno-mmx" { target i?86-*-* x86_64-*-* } } */ -+/* { dg-additional-options "-mno-sse -mno-mmx -mfpmath=387" { target i?86-*-* x86_64-*-* } } */ - /* { dg-additional-options "-mno-altivec -mno-vsx" { target powerpc*-*-* } } */ - - extern void fn2(); -diff --git a/gcc/testsuite/gcc.dg/pr68306.c b/gcc/testsuite/gcc.dg/pr68306.c -index 54e5b40f221..0813389e2c1 100644 ---- a/gcc/testsuite/gcc.dg/pr68306.c -+++ b/gcc/testsuite/gcc.dg/pr68306.c -@@ -1,6 +1,6 @@ - /* { dg-do compile } */ - /* { dg-options "-O3" } */ --/* { dg-additional-options "-mno-sse -mno-mmx" { target i?86-*-* x86_64-*-* } } */ -+/* { dg-additional-options "-mno-sse -mno-mmx -mfpmath=387" { target i?86-*-* x86_64-*-* } } */ - - enum powerpc_pmc_type { PPC_PMC_IBM }; - struct { -diff --git a/gcc/testsuite/gcc.dg/pr69634.c b/gcc/testsuite/gcc.dg/pr69634.c -index 60a56149463..bcc23f9ccd6 100644 ---- a/gcc/testsuite/gcc.dg/pr69634.c -+++ b/gcc/testsuite/gcc.dg/pr69634.c -@@ -1,6 +1,6 @@ - /* { dg-do compile } */ - /* { dg-options "-O2 -fno-dce -fschedule-insns -fno-tree-vrp -fcompare-debug -Wno-psabi" } */ --/* { dg-additional-options "-mno-sse" { target i?86-*-* x86_64-*-* } } */ -+/* { dg-additional-options "-mno-sse -mfpmath=387" { target i?86-*-* x86_64-*-* } } */ - /* { dg-require-effective-target scheduling } */ - - typedef unsigned short u16; -diff --git a/gcc/testsuite/gcc.target/i386/amd64-abi-1.c b/gcc/testsuite/gcc.target/i386/amd64-abi-1.c -index 69fde57bf06..7f1f1c03edf 100644 ---- a/gcc/testsuite/gcc.target/i386/amd64-abi-1.c -+++ b/gcc/testsuite/gcc.target/i386/amd64-abi-1.c -@@ -1,5 +1,5 @@ - /* { dg-do compile { target { ! ia32 } } } */ --/* { dg-options "-mno-sse" } */ -+/* { dg-options "-mno-sse -mfpmath=387" } */ - /* { dg-additional-options "-mabi=sysv" { target *-*-mingw* } } */ - - double foo(void) { return 0; } /* { dg-error "SSE disabled" } */ -diff --git a/gcc/testsuite/gcc.target/i386/funcspec-6.c b/gcc/testsuite/gcc.target/i386/funcspec-6.c -index ea896b7ebfd..bf15569b826 100644 ---- a/gcc/testsuite/gcc.target/i386/funcspec-6.c -+++ b/gcc/testsuite/gcc.target/i386/funcspec-6.c -@@ -1,6 +1,7 @@ - /* Test whether all of the 64-bit function specific options are accepted - without error. */ - /* { dg-do compile { target { ! ia32 } } } */ -+/* { dg-additional-options "-mfpmath=387" } */ - - #include "funcspec-56.inc" - -diff --git a/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c b/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c -index 3fbdc881dda..6b4d9d1252a 100644 ---- a/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c -+++ b/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c -@@ -1,5 +1,5 @@ - /* { dg-do compile } */ --/* { dg-options "-O2 -mgeneral-regs-only -mno-cld -mno-iamcu -m80387" } */ -+/* { dg-options "-O2 -mgeneral-regs-only -mno-cld -mno-iamcu -m80387 -mfpmath=387" } */ - - typedef unsigned int uword_t __attribute__ ((mode (__word__))); - -diff --git a/gcc/testsuite/gcc.target/i386/isa-14.c b/gcc/testsuite/gcc.target/i386/isa-14.c -index 5d49e6e77fe..1de2db92bdd 100644 ---- a/gcc/testsuite/gcc.target/i386/isa-14.c -+++ b/gcc/testsuite/gcc.target/i386/isa-14.c -@@ -1,5 +1,5 @@ - /* { dg-do run } */ --/* { dg-options "-march=x86-64 -msse4a -mfma4 -mno-sse" } */ -+/* { dg-options "-march=x86-64 -msse4a -mfma4 -mno-sse -mfpmath=387" } */ - - extern void abort (void); - -diff --git a/gcc/testsuite/gcc.target/i386/pr44948-2b.c b/gcc/testsuite/gcc.target/i386/pr44948-2b.c -index fa1769b62fb..f79fb12726f 100644 ---- a/gcc/testsuite/gcc.target/i386/pr44948-2b.c -+++ b/gcc/testsuite/gcc.target/i386/pr44948-2b.c -@@ -1,5 +1,5 @@ - /* { dg-do compile } */ --/* { dg-options "-O -mno-sse -Wno-psabi -mtune=generic" } */ -+/* { dg-options "-O -mno-sse -Wno-psabi -mtune=generic -mfpmath=387" } */ - - struct A - { -diff --git a/gcc/testsuite/gcc.target/i386/pr53425-1.c b/gcc/testsuite/gcc.target/i386/pr53425-1.c -index 2e89ff7d81d..6339bf6b736 100644 ---- a/gcc/testsuite/gcc.target/i386/pr53425-1.c -+++ b/gcc/testsuite/gcc.target/i386/pr53425-1.c -@@ -1,6 +1,6 @@ - /* PR target/53425 */ - /* { dg-do compile { target { ! ia32 } } } */ --/* { dg-options "-O2 -mno-sse" } */ -+/* { dg-options "-O2 -mno-sse -mfpmath=387" } */ - /* { dg-skip-if "no SSE vector" { x86_64-*-mingw* } } */ - - typedef double __v2df __attribute__ ((__vector_size__ (16))); -diff --git a/gcc/testsuite/gcc.target/i386/pr53425-2.c b/gcc/testsuite/gcc.target/i386/pr53425-2.c -index 61f6283dbe9..2c5a55f0ac3 100644 ---- a/gcc/testsuite/gcc.target/i386/pr53425-2.c -+++ b/gcc/testsuite/gcc.target/i386/pr53425-2.c -@@ -1,6 +1,6 @@ - /* PR target/53425 */ - /* { dg-do compile { target { ! ia32 } } } */ --/* { dg-options "-O2 -mno-sse" } */ -+/* { dg-options "-O2 -mno-sse -mfpmath=387" } */ - /* { dg-skip-if "no SSE vector" { x86_64-*-mingw* } } */ - - typedef float __v2sf __attribute__ ((__vector_size__ (8))); -diff --git a/gcc/testsuite/gcc.target/i386/pr55247.c b/gcc/testsuite/gcc.target/i386/pr55247.c -index 23366d0909d..9810e3abb76 100644 ---- a/gcc/testsuite/gcc.target/i386/pr55247.c -+++ b/gcc/testsuite/gcc.target/i386/pr55247.c -@@ -1,6 +1,6 @@ - /* { dg-do compile { target { ! ia32 } } } */ - /* { dg-require-effective-target maybe_x32 } */ --/* { dg-options "-O2 -mno-sse -mno-mmx -mx32 -maddress-mode=long" } */ -+/* { dg-options "-O2 -mno-sse -mno-mmx -mx32 -maddress-mode=long -mfpmath=387" } */ - - typedef unsigned int uint32_t; - typedef uint32_t Elf32_Word; -diff --git a/gcc/testsuite/gcc.target/i386/pr59644.c b/gcc/testsuite/gcc.target/i386/pr59644.c -index 96006b3e338..4287e4538bf 100644 ---- a/gcc/testsuite/gcc.target/i386/pr59644.c -+++ b/gcc/testsuite/gcc.target/i386/pr59644.c -@@ -1,6 +1,6 @@ - /* PR target/59644 */ - /* { dg-do run { target lp64 } } */ --/* { dg-options "-O2 -ffreestanding -mno-sse -mpreferred-stack-boundary=3 -maccumulate-outgoing-args -mno-red-zone" } */ -+/* { dg-options "-O2 -ffreestanding -mno-sse -mpreferred-stack-boundary=3 -maccumulate-outgoing-args -mno-red-zone -mfpmath=387" } */ - - /* This test uses __builtin_trap () instead of e.g. abort, - because due to -mpreferred-stack-boundary=3 it should not call -diff --git a/gcc/testsuite/gcc.target/i386/pr62120.c b/gcc/testsuite/gcc.target/i386/pr62120.c -index bfb8c4703eb..ed04cf181f3 100644 ---- a/gcc/testsuite/gcc.target/i386/pr62120.c -+++ b/gcc/testsuite/gcc.target/i386/pr62120.c -@@ -1,5 +1,5 @@ - /* { dg-do compile } */ --/* { dg-options "-mno-sse" } */ -+/* { dg-options "-mno-sse -mfpmath=387" } */ - - void foo () - { -diff --git a/gcc/testsuite/gcc.target/i386/pr70467-1.c b/gcc/testsuite/gcc.target/i386/pr70467-1.c -index 4e112c88d07..bcfb396a68d 100644 ---- a/gcc/testsuite/gcc.target/i386/pr70467-1.c -+++ b/gcc/testsuite/gcc.target/i386/pr70467-1.c -@@ -1,6 +1,6 @@ - /* PR rtl-optimization/70467 */ - /* { dg-do compile } */ --/* { dg-options "-O2 -mno-sse" } */ -+/* { dg-options "-O2 -mno-sse -mfpmath=387" } */ - - void foo (unsigned long long *); - -diff --git a/gcc/testsuite/gcc.target/i386/warn-vect-op-1.c b/gcc/testsuite/gcc.target/i386/warn-vect-op-1.c -index 6cda1534311..26e37f5b8ba 100644 ---- a/gcc/testsuite/gcc.target/i386/warn-vect-op-1.c -+++ b/gcc/testsuite/gcc.target/i386/warn-vect-op-1.c -@@ -1,5 +1,5 @@ - /* { dg-do compile { target { ! ia32 } } } */ --/* { dg-options "-mno-sse -Wvector-operation-performance" } */ -+/* { dg-options "-mno-sse -Wvector-operation-performance -mfpmath=387" } */ - #define vector(elcount, type) \ - __attribute__((vector_size((elcount)*sizeof(type)))) type - --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0038-Re-introduce-spe-commandline-options.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0038-Re-introduce-spe-commandline-options.patch deleted file mode 100644 index 8de8892b8..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0038-Re-introduce-spe-commandline-options.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f0bea96434ac478c3cff8c29dd97cccfac5b35e3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 6 Jun 2018 12:10:22 -0700 -Subject: [PATCH 38/40] Re-introduce spe commandline options - -This should ensure that we keep accepting -spe options - -Upstream-Status: Inappropriate [SPE port is removed from rs600 port] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gcc/config/rs6000/rs6000.opt | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt -index ace8a477550..d6a8f825d88 100644 ---- a/gcc/config/rs6000/rs6000.opt -+++ b/gcc/config/rs6000/rs6000.opt -@@ -365,6 +365,18 @@ mdebug= - Target RejectNegative Joined - -mdebug= Enable debug output. - -+mspe -+Target Var(rs6000_spe) Save -+Generate SPE SIMD instructions on E500. -+ -+mabi=spe -+Target RejectNegative Var(rs6000_spe_abi) Save -+Use the SPE ABI extensions. -+ -+mabi=no-spe -+Target RejectNegative Var(rs6000_spe_abi, 0) -+Do not use the SPE ABI extensions. -+ - mabi=altivec - Target RejectNegative Var(rs6000_altivec_abi) Save - Use the AltiVec ABI extensions. --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0039-riscv-Disable-multilib-for-OE.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0039-riscv-Disable-multilib-for-OE.patch deleted file mode 100644 index f7b222e81..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0039-riscv-Disable-multilib-for-OE.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 24f74444c00c6c9bf076fb002614ebf6dec31f1a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 28 Dec 2018 09:59:53 -0800 -Subject: [PATCH 39/40] riscv: Disable multilib for OE - -Upstream-Status: Inappropriate [OE-Specific] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gcc/config/riscv/t-linux | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux -index 216d2776a18..e4d817621fc 100644 ---- a/gcc/config/riscv/t-linux -+++ b/gcc/config/riscv/t-linux -@@ -1,3 +1,5 @@ - # Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/ --MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES))) --MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) -+#MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES))) -+MULTILIB_DIRNAMES := . . -+#MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) -+MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0040-powerpc-powerpc64-Add-support-for-musl-ldso.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0040-powerpc-powerpc64-Add-support-for-musl-ldso.patch deleted file mode 100644 index 9fba16377..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0040-powerpc-powerpc64-Add-support-for-musl-ldso.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4bd0a3866f302725cb4eddcaddaeece64900c42f Mon Sep 17 00:00:00 2001 -From: Serhey Popovych <serhe.popovych@gmail.com> -Date: Tue, 11 Dec 2018 02:30:50 -0500 -Subject: [PATCH 40/40] powerpc/powerpc64: Add support for musl ldso - -Upstream-Status: Inappropriate [OE-Specific] - -Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> ---- - gcc/config/rs6000/linux64.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h -index 619e113e2b8..ee8b44f9374 100644 ---- a/gcc/config/rs6000/linux64.h -+++ b/gcc/config/rs6000/linux64.h -@@ -421,9 +421,9 @@ extern int dot_symbols; - #endif - - #define MUSL_DYNAMIC_LINKER32 \ -- "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" -+ SYSTEMLIBS_DIR "ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" - #define MUSL_DYNAMIC_LINKER64 \ -- "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" -+ SYSTEMLIBS_DIR "ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" - - #define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0" - #define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0" --- -2.21.0 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0041-Add-a-recursion-limit-to-libiberty-s-demangling-code.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0041-Add-a-recursion-limit-to-libiberty-s-demangling-code.patch deleted file mode 100644 index f3303b685..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0041-Add-a-recursion-limit-to-libiberty-s-demangling-code.patch +++ /dev/null @@ -1,325 +0,0 @@ -From e1744e11b1c2b36f91a8847b61bafb8c5e7407ae Mon Sep 17 00:00:00 2001 -From: nickc <nickc@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Fri, 7 Dec 2018 10:33:30 +0000 -Subject: [PATCH] Add a recursion limit to libiberty's demangling code. The - limit is enabled by default, but can be disabled via a new demangling option. - -include * demangle.h (DMGL_NO_RECURSE_LIMIT): Define. - (DEMANGLE_RECURSION_LIMIT): Define - - PR 87681 - PR 87675 - PR 87636 - PR 87350 - PR 87335 -libiberty * cp-demangle.h (struct d_info): Add recursion_level field. - * cp-demangle.c (d_function_type): Add recursion counter. - If the recursion limit is reached and the check is not disabled, - then return with a failure result. - (cplus_demangle_init_info): Initialise the recursion_level field. - (d_demangle_callback): If the recursion limit is enabled, check - for a mangled string that is so long that there is not enough - stack space for the local arrays. - * cplus-dem.c (struct work): Add recursion_level field. - (squangle_mop_up): Set the numb and numk fields to zero. - (work_stuff_copy_to_from): Handle the case where a btypevec or - ktypevec field is NULL. - (demangle_nested_args): Add recursion counter. If - the recursion limit is not disabled and reached, return with a - failure result. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@266886 138bc75d-0d04-0410-961f-82ee72b054a4 - -CVE: CVE-2018-18484 -Upstream-Status: Backport [https://github.com/gcc-mirror/gcc/commit/03e51746ed98d9106803f6009ebd71ea670ad3b9] -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - include/ChangeLog | 5 +++++ - include/demangle.h | 11 +++++++++++ - libiberty/ChangeLog | 23 ++++++++++++++++++++++ - libiberty/cp-demangle.c | 51 ++++++++++++++++++++++++++++++++++++++----------- - libiberty/cp-demangle.h | 3 +++ - libiberty/cplus-dem.c | 37 +++++++++++++++++++++++++++++++++-- - 6 files changed, 117 insertions(+), 13 deletions(-) - -diff --git a/include/ChangeLog b/include/ChangeLog -index 02ab336..88b0648 100644 ---- a/include/ChangeLog -+++ b/include/ChangeLog -@@ -2,6 +2,11 @@ - - * GCC 8.3.0 released. - -+2018-12-07 Nick Clifton <nickc@redhat.com> -+ -+ * demangle.h (DMGL_NO_RECURSE_LIMIT): Define. -+ (DEMANGLE_RECURSION_LIMIT): Define -+ - 2018-07-26 Release Manager - - * GCC 8.2.0 released. -diff --git a/include/demangle.h b/include/demangle.h -index b8d57cf..9bb8a19 100644 ---- a/include/demangle.h -+++ b/include/demangle.h -@@ -68,6 +68,17 @@ extern "C" { - /* If none of these are set, use 'current_demangling_style' as the default. */ - #define DMGL_STYLE_MASK (DMGL_AUTO|DMGL_GNU|DMGL_LUCID|DMGL_ARM|DMGL_HP|DMGL_EDG|DMGL_GNU_V3|DMGL_JAVA|DMGL_GNAT|DMGL_DLANG|DMGL_RUST) - -+/* Disable a limit on the depth of recursion in mangled strings. -+ Note if this limit is disabled then stack exhaustion is possible when -+ demangling pathologically complicated strings. Bug reports about stack -+ exhaustion when the option is enabled will be rejected. */ -+#define DMGL_NO_RECURSE_LIMIT (1 << 18) -+ -+/* If DMGL_NO_RECURSE_LIMIT is not enabled, then this is the value used as -+ the maximum depth of recursion allowed. It should be enough for any -+ real-world mangled name. */ -+#define DEMANGLE_RECURSION_LIMIT 1024 -+ - /* Enumeration of possible demangling styles. - - Lucid and ARM styles are still kept logically distinct, even though -diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog -index 1dd05da..2f77038 100644 ---- a/libiberty/ChangeLog -+++ b/libiberty/ChangeLog -@@ -9,6 +9,29 @@ - (simple_object_copy_lto_debug_sections): Create file in binary - mode. - -+2018-12-07 Nick Clifton <nickc@redhat.com> -+ -+ PR 87681 -+ PR 87675 -+ PR 87636 -+ PR 87350 -+ PR 87335 -+ * cp-demangle.h (struct d_info): Add recursion_level field. -+ * cp-demangle.c (d_function_type): Add recursion counter. -+ If the recursion limit is reached and the check is not disabled, -+ then return with a failure result. -+ (cplus_demangle_init_info): Initialise the recursion_level field. -+ (d_demangle_callback): If the recursion limit is enabled, check -+ for a mangled string that is so long that there is not enough -+ stack space for the local arrays. -+ * cplus-dem.c (struct work): Add recursion_level field. -+ (squangle_mop_up): Set the numb and numk fields to zero. -+ (work_stuff_copy_to_from): Handle the case where a btypevec or -+ ktypevec field is NULL. -+ (demangle_nested_args): Add recursion counter. If -+ the recursion limit is not disabled and reached, return with a -+ failure result. -+ - 2018-07-26 Release Manager - - * GCC 8.2.0 released. -diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c -index 3f2a097..c374e46 100644 ---- a/libiberty/cp-demangle.c -+++ b/libiberty/cp-demangle.c -@@ -2843,21 +2843,35 @@ d_ref_qualifier (struct d_info *di, struct demangle_component *sub) - static struct demangle_component * - d_function_type (struct d_info *di) - { -- struct demangle_component *ret; -+ struct demangle_component *ret = NULL; - -- if (! d_check_char (di, 'F')) -- return NULL; -- if (d_peek_char (di) == 'Y') -+ if ((di->options & DMGL_NO_RECURSE_LIMIT) == 0) - { -- /* Function has C linkage. We don't print this information. -- FIXME: We should print it in verbose mode. */ -- d_advance (di, 1); -+ if (di->recursion_level > DEMANGLE_RECURSION_LIMIT) -+ /* FIXME: There ought to be a way to report -+ that the recursion limit has been reached. */ -+ return NULL; -+ -+ di->recursion_level ++; - } -- ret = d_bare_function_type (di, 1); -- ret = d_ref_qualifier (di, ret); - -- if (! d_check_char (di, 'E')) -- return NULL; -+ if (d_check_char (di, 'F')) -+ { -+ if (d_peek_char (di) == 'Y') -+ { -+ /* Function has C linkage. We don't print this information. -+ FIXME: We should print it in verbose mode. */ -+ d_advance (di, 1); -+ } -+ ret = d_bare_function_type (di, 1); -+ ret = d_ref_qualifier (di, ret); -+ -+ if (! d_check_char (di, 'E')) -+ ret = NULL; -+ } -+ -+ if ((di->options & DMGL_NO_RECURSE_LIMIT) == 0) -+ di->recursion_level --; - return ret; - } - -@@ -6188,6 +6202,7 @@ cplus_demangle_init_info (const char *mangled, int options, size_t len, - di->expansion = 0; - di->is_expression = 0; - di->is_conversion = 0; -+ di->recursion_level = 0; - } - - /* Internal implementation for the demangler. If MANGLED is a g++ v3 ABI -@@ -6227,6 +6242,20 @@ d_demangle_callback (const char *mangled, int options, - - cplus_demangle_init_info (mangled, options, strlen (mangled), &di); - -+ /* PR 87675 - Check for a mangled string that is so long -+ that we do not have enough stack space to demangle it. */ -+ if (((options & DMGL_NO_RECURSE_LIMIT) == 0) -+ /* This check is a bit arbitrary, since what we really want to do is to -+ compare the sizes of the di.comps and di.subs arrays against the -+ amount of stack space remaining. But there is no portable way to do -+ this, so instead we use the recursion limit as a guide to the maximum -+ size of the arrays. */ -+ && (unsigned long) di.num_comps > DEMANGLE_RECURSION_LIMIT) -+ { -+ /* FIXME: We need a way to indicate that a stack limit has been reached. */ -+ return 0; -+ } -+ - { - #ifdef CP_DYNAMIC_ARRAYS - __extension__ struct demangle_component comps[di.num_comps]; -diff --git a/libiberty/cp-demangle.h b/libiberty/cp-demangle.h -index 51b8a24..d87a830 100644 ---- a/libiberty/cp-demangle.h -+++ b/libiberty/cp-demangle.h -@@ -122,6 +122,9 @@ struct d_info - /* Non-zero if we are parsing the type operand of a conversion - operator, but not when in an expression. */ - int is_conversion; -+ /* If DMGL_NO_RECURSE_LIMIT is not active then this is set to -+ the current recursion level. */ -+ unsigned int recursion_level; - }; - - /* To avoid running past the ending '\0', don't: -diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c -index 6d58bd8..8b9646f 100644 ---- a/libiberty/cplus-dem.c -+++ b/libiberty/cplus-dem.c -@@ -146,6 +146,7 @@ struct work_stuff - int *proctypevec; /* Indices of currently processed remembered typevecs. */ - int proctypevec_size; - int nproctypes; -+ unsigned int recursion_level; - }; - - #define PRINT_ANSI_QUALIFIERS (work -> options & DMGL_ANSI) -@@ -1292,12 +1293,14 @@ squangle_mop_up (struct work_stuff *work) - free ((char *) work -> btypevec); - work->btypevec = NULL; - work->bsize = 0; -+ work->numb = 0; - } - if (work -> ktypevec != NULL) - { - free ((char *) work -> ktypevec); - work->ktypevec = NULL; - work->ksize = 0; -+ work->numk = 0; - } - } - -@@ -1331,8 +1334,15 @@ work_stuff_copy_to_from (struct work_stuff *to, struct work_stuff *from) - - for (i = 0; i < from->numk; i++) - { -- int len = strlen (from->ktypevec[i]) + 1; -+ int len; -+ -+ if (from->ktypevec[i] == NULL) -+ { -+ to->ktypevec[i] = NULL; -+ continue; -+ } - -+ len = strlen (from->ktypevec[i]) + 1; - to->ktypevec[i] = XNEWVEC (char, len); - memcpy (to->ktypevec[i], from->ktypevec[i], len); - } -@@ -1342,8 +1352,15 @@ work_stuff_copy_to_from (struct work_stuff *to, struct work_stuff *from) - - for (i = 0; i < from->numb; i++) - { -- int len = strlen (from->btypevec[i]) + 1; -+ int len; -+ -+ if (from->btypevec[i] == NULL) -+ { -+ to->btypevec[i] = NULL; -+ continue; -+ } - -+ len = strlen (from->btypevec[i]) + 1; - to->btypevec[i] = XNEWVEC (char , len); - memcpy (to->btypevec[i], from->btypevec[i], len); - } -@@ -1401,6 +1418,7 @@ delete_non_B_K_work_stuff (struct work_stuff *work) - - free ((char*) work->tmpl_argvec); - work->tmpl_argvec = NULL; -+ work->ntmpl_args = 0; - } - if (work->previous_argument) - { -@@ -4477,6 +4495,7 @@ remember_Btype (struct work_stuff *work, const char *start, - } - - /* Lose all the info related to B and K type codes. */ -+ - static void - forget_B_and_K_types (struct work_stuff *work) - { -@@ -4502,6 +4521,7 @@ forget_B_and_K_types (struct work_stuff *work) - } - } - } -+ - /* Forget the remembered types, but not the type vector itself. */ - - static void -@@ -4696,6 +4716,16 @@ demangle_nested_args (struct work_stuff *work, const char **mangled, - int result; - int saved_nrepeats; - -+ if ((work->options & DMGL_NO_RECURSE_LIMIT) == 0) -+ { -+ if (work->recursion_level > DEMANGLE_RECURSION_LIMIT) -+ /* FIXME: There ought to be a way to report -+ that the recursion limit has been reached. */ -+ return 0; -+ -+ work->recursion_level ++; -+ } -+ - /* The G++ name-mangling algorithm does not remember types on nested - argument lists, unless -fsquangling is used, and in that case the - type vector updated by remember_type is not used. So, we turn -@@ -4722,6 +4752,9 @@ demangle_nested_args (struct work_stuff *work, const char **mangled, - --work->forgetting_types; - work->nrepeats = saved_nrepeats; - -+ if ((work->options & DMGL_NO_RECURSE_LIMIT) == 0) -+ --work->recursion_level; -+ - return result; - } - --- -2.7.4 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0042-PR-debug-86964.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0042-PR-debug-86964.patch deleted file mode 100644 index d9b5d39b7..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0042-PR-debug-86964.patch +++ /dev/null @@ -1,94 +0,0 @@ -From beb921e1106b5bcbb0c6e2be84b241327e2ffc51 Mon Sep 17 00:00:00 2001 -From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Mon, 25 Mar 2019 21:19:09 +0000 -Subject: [PATCH] PR debug/86964 * dwarf2out.c - (premark_used_variables): New function. (prune_unused_types_walk): Do - not mark not premarked external variables. (prune_unused_types): - Call premark_used_variables. - - * gcc.dg/debug/dwarf2/pr86964.c: New testcase. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@269925 138bc75d-0d04-0410-961f-82ee72b054a4 - -Upstream-Status: Backport -Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> ---- - gcc/ChangeLog | 8 ++++++ - gcc/dwarf2out.c | 32 +++++++++++++++++++++ - 2 files changed, 40 insertions(+) - -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index 2075480ca2b..cdce539ac6f 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1,3 +1,11 @@ -+2019-03-25 Johan Karlsson <johan.karlsson@enea.com> -+ -+ PR debug/86964 -+ * dwarf2out.c (premark_used_variables): New function. -+ (prune_unused_types_walk): Do not mark not premarked external -+ variables. -+ (prune_unused_types): Call premark_used_variables. -+ - 2019-02-22 Release Manager - - * GCC 8.3.0 released. -diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c -index ae8bdee9981..b9a624e1ac7 100644 ---- a/gcc/dwarf2out.c -+++ b/gcc/dwarf2out.c -@@ -22658,6 +22658,21 @@ premark_types_used_by_global_vars (void) - ->traverse<void *, premark_types_used_by_global_vars_helper> (NULL); - } - -+/* Mark all variables used by the symtab as perennial. */ -+ -+static void -+premark_used_variables (void) -+{ -+ /* Mark DIEs in the symtab as used. */ -+ varpool_node *var; -+ FOR_EACH_VARIABLE (var) -+ { -+ dw_die_ref die = lookup_decl_die (var->decl); -+ if (die) -+ die->die_perennial_p = 1; -+ } -+} -+ - /* Generate a DW_TAG_call_site DIE in function DECL under SUBR_DIE - for CA_LOC call arg loc node. */ - -@@ -29264,6 +29279,19 @@ prune_unused_types_walk (dw_die_ref die) - - return; - -+ case DW_TAG_variable: -+ if (flag_debug_only_used_symbols) -+ { -+ if (die->die_perennial_p) -+ break; -+ -+ /* premark_used_variables marks external variables --- don't mark -+ them here. */ -+ if (get_AT (die, DW_AT_external)) -+ return; -+ } -+ /* FALLTHROUGH */ -+ - default: - /* Mark everything else. */ - break; -@@ -29390,6 +29418,10 @@ prune_unused_types (void) - /* Mark types that are used in global variables. */ - premark_types_used_by_global_vars (); - -+ /* Mark variables used in the symtab. */ -+ if (flag_debug_only_used_symbols) -+ premark_used_variables (); -+ - /* Set the mark on nodes that are actually used. */ - prune_unused_types_walk (comp_unit_die ()); - for (node = limbo_die_list; node; node = node->next) --- -2.21.0 diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/0043-PR85434-Prevent-spilling-of-stack-protector-guard-s-.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/0043-PR85434-Prevent-spilling-of-stack-protector-guard-s-.patch deleted file mode 100644 index f15207f58..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-8.3/0043-PR85434-Prevent-spilling-of-stack-protector-guard-s-.patch +++ /dev/null @@ -1,813 +0,0 @@ -From f98495d90ba66f67fe922a4b9229ea787041c418 Mon Sep 17 00:00:00 2001 -From: thopre01 <thopre01@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Thu, 22 Nov 2018 14:46:17 +0000 -Subject: [PATCH] PR85434: Prevent spilling of stack protector guard's address - on ARM - -In case of high register pressure in PIC mode, address of the stack -protector's guard can be spilled on ARM targets as shown in PR85434, -thus allowing an attacker to control what the canary would be compared -against. ARM does lack stack_protect_set and stack_protect_test insn -patterns, defining them does not help as the address is expanded -regularly and the patterns only deal with the copy and test of the -guard with the canary. - -This problem does not occur for x86 targets because the PIC access and -the test can be done in the same instruction. Aarch64 is exempt too -because PIC access insn pattern are mov of UNSPEC which prevents it from -the second access in the epilogue being CSEd in cse_local pass with the -first access in the prologue. - -The approach followed here is to create new "combined" set and test -standard pattern names that take the unexpanded guard and do the set or -test. This allows the target to use an opaque pattern (eg. using UNSPEC) -to hide the individual instructions being generated to the compiler and -split the pattern into generic load, compare and branch instruction -after register allocator, therefore avoiding any spilling. This is here -implemented for the ARM targets. For targets not implementing these new -standard pattern names, the existing stack_protect_set and -stack_protect_test pattern names are used. - -To be able to split PIC access after register allocation, the functions -had to be augmented to force a new PIC register load and to control -which register it loads into. This is because sharing the PIC register -between prologue and epilogue could lead to spilling due to CSE again -which an attacker could use to control what the canary gets compared -against. - -2018-11-22 Thomas Preud'homme <thomas.preudhomme@linaro.org> - - gcc/ - PR target/85434 - * target-insns.def (stack_protect_combined_set): Define new standard - pattern name. - (stack_protect_combined_test): Likewise. - * cfgexpand.c (stack_protect_prologue): Try new - stack_protect_combined_set pattern first. - * function.c (stack_protect_epilogue): Try new - stack_protect_combined_test pattern first. - * config/arm/arm.c (require_pic_register): Add pic_reg and compute_now - parameters to control which register to use as PIC register and force - reloading PIC register respectively. Insert in the stream of insns if - possible. - (legitimize_pic_address): Expose above new parameters in prototype and - adapt recursive calls accordingly. Use pic_reg if non null instead of - cached one. - (arm_load_pic_register): Add pic_reg parameter and use it if non null. - (arm_legitimize_address): Adapt to new legitimize_pic_address - prototype. - (thumb_legitimize_address): Likewise. - (arm_emit_call_insn): Adapt to require_pic_register prototype change. - (arm_expand_prologue): Adapt to arm_load_pic_register prototype change. - (thumb1_expand_prologue): Likewise. - * config/arm/arm-protos.h (legitimize_pic_address): Adapt to prototype - change. - (arm_load_pic_register): Likewise. - * config/arm/predicated.md (guard_addr_operand): New predicate. - (guard_operand): New predicate. - * config/arm/arm.md (movsi expander): Adapt to legitimize_pic_address - prototype change. - (builtin_setjmp_receiver expander): Adapt to thumb1_expand_prologue - prototype change. - (stack_protect_combined_set): New expander.. - (stack_protect_combined_set_insn): New insn_and_split pattern. - (stack_protect_set_insn): New insn pattern. - (stack_protect_combined_test): New expander. - (stack_protect_combined_test_insn): New insn_and_split pattern. - (arm_stack_protect_test_insn): New insn pattern. - * config/arm/thumb1.md (thumb1_stack_protect_test_insn): New insn pattern. - * config/arm/unspecs.md (UNSPEC_SP_SET): New unspec. - (UNSPEC_SP_TEST): Likewise. - * doc/md.texi (stack_protect_combined_set): Document new standard - pattern name. - (stack_protect_set): Clarify that the operand for guard's address is - legal. - (stack_protect_combined_test): Document new standard pattern name. - (stack_protect_test): Clarify that the operand for guard's address is - legal. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@266379 138bc75d-0d04-0410-961f-82ee72b054a4 - -Upstream-Status: Backport -CVE: CVE-2018-12886 -Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> ---- - gcc/ChangeLog | 49 ++++++ - gcc/cfgexpand.c | 17 +++ - gcc/config/arm/arm-protos.h | 4 +- - gcc/config/arm/arm.c | 87 ++++++++--- - gcc/config/arm/arm.md | 163 +++++++++++++++++++- - gcc/config/arm/predicates.md | 17 +++ - gcc/config/arm/thumb1.md | 13 ++ - gcc/config/arm/unspecs.md | 3 + - gcc/doc/md.texi | 55 ++++++- - gcc/function.c | 32 +++- - gcc/target-insns.def | 2 + - 11 files changed, 399 insertions(+), 43 deletions(-) - create mode 100644 gcc/testsuite/gcc.target/arm/pr85434.c - -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index e2ebfd34214..fa41e7112e0 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1537,6 +1537,55 @@ - * config/arm/neon.md (movv4hf, movv8hf): Refactored to.. - (mov<mov>): ..this and enable unconditionally. - -+2018-11-22 Thomas Preud'homme <thomas.preudhomme@linaro.org> -+ -+ * target-insns.def (stack_protect_combined_set): Define new standard -+ pattern name. -+ (stack_protect_combined_test): Likewise. -+ * cfgexpand.c (stack_protect_prologue): Try new -+ stack_protect_combined_set pattern first. -+ * function.c (stack_protect_epilogue): Try new -+ stack_protect_combined_test pattern first. -+ * config/arm/arm.c (require_pic_register): Add pic_reg and compute_now -+ parameters to control which register to use as PIC register and force -+ reloading PIC register respectively. Insert in the stream of insns if -+ possible. -+ (legitimize_pic_address): Expose above new parameters in prototype and -+ adapt recursive calls accordingly. Use pic_reg if non null instead of -+ cached one. -+ (arm_load_pic_register): Add pic_reg parameter and use it if non null. -+ (arm_legitimize_address): Adapt to new legitimize_pic_address -+ prototype. -+ (thumb_legitimize_address): Likewise. -+ (arm_emit_call_insn): Adapt to require_pic_register prototype change. -+ (arm_expand_prologue): Adapt to arm_load_pic_register prototype change. -+ (thumb1_expand_prologue): Likewise. -+ * config/arm/arm-protos.h (legitimize_pic_address): Adapt to prototype -+ change. -+ (arm_load_pic_register): Likewise. -+ * config/arm/predicated.md (guard_addr_operand): New predicate. -+ (guard_operand): New predicate. -+ * config/arm/arm.md (movsi expander): Adapt to legitimize_pic_address -+ prototype change. -+ (builtin_setjmp_receiver expander): Adapt to thumb1_expand_prologue -+ prototype change. -+ (stack_protect_combined_set): New expander.. -+ (stack_protect_combined_set_insn): New insn_and_split pattern. -+ (stack_protect_set_insn): New insn pattern. -+ (stack_protect_combined_test): New expander. -+ (stack_protect_combined_test_insn): New insn_and_split pattern. -+ (arm_stack_protect_test_insn): New insn pattern. -+ * config/arm/thumb1.md (thumb1_stack_protect_test_insn): New insn pattern. -+ * config/arm/unspecs.md (UNSPEC_SP_SET): New unspec. -+ (UNSPEC_SP_TEST): Likewise. -+ * doc/md.texi (stack_protect_combined_set): Document new standard -+ pattern name. -+ (stack_protect_set): Clarify that the operand for guard's address is -+ legal. -+ (stack_protect_combined_test): Document new standard pattern name. -+ (stack_protect_test): Clarify that the operand for guard's address is -+ legal. -+ - 2018-11-22 Uros Bizjak <ubizjak@gmail.com> - - Backport from mainline -diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c -index 8fa392fcd8a..21bdcdaeaa3 100644 ---- a/gcc/cfgexpand.c -+++ b/gcc/cfgexpand.c -@@ -6185,6 +6185,23 @@ stack_protect_prologue (void) - rtx x, y; - - x = expand_normal (crtl->stack_protect_guard); -+ -+ if (targetm.have_stack_protect_combined_set () && guard_decl) -+ { -+ gcc_assert (DECL_P (guard_decl)); -+ y = DECL_RTL (guard_decl); -+ -+ /* Allow the target to compute address of Y and copy it to X without -+ leaking Y into a register. This combined address + copy pattern -+ allows the target to prevent spilling of any intermediate results by -+ splitting it after register allocator. */ -+ if (rtx_insn *insn = targetm.gen_stack_protect_combined_set (x, y)) -+ { -+ emit_insn (insn); -+ return; -+ } -+ } -+ - if (guard_decl) - y = expand_normal (guard_decl); - else -diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h -index 8d6d2395b84..00f5f16ed02 100644 ---- a/gcc/config/arm/arm-protos.h -+++ b/gcc/config/arm/arm-protos.h -@@ -28,7 +28,7 @@ extern enum unwind_info_type arm_except_unwind_info (struct gcc_options *); - extern int use_return_insn (int, rtx); - extern bool use_simple_return_p (void); - extern enum reg_class arm_regno_class (int); --extern void arm_load_pic_register (unsigned long); -+extern void arm_load_pic_register (unsigned long, rtx); - extern int arm_volatile_func (void); - extern void arm_expand_prologue (void); - extern void arm_expand_epilogue (bool); -@@ -69,7 +69,7 @@ extern int const_ok_for_dimode_op (HOST_WIDE_INT, enum rtx_code); - extern int arm_split_constant (RTX_CODE, machine_mode, rtx, - HOST_WIDE_INT, rtx, rtx, int); - extern int legitimate_pic_operand_p (rtx); --extern rtx legitimize_pic_address (rtx, machine_mode, rtx); -+extern rtx legitimize_pic_address (rtx, machine_mode, rtx, rtx, bool); - extern rtx legitimize_tls_address (rtx, rtx); - extern bool arm_legitimate_address_p (machine_mode, rtx, bool); - extern int arm_legitimate_address_outer_p (machine_mode, rtx, RTX_CODE, int); -diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c -index 8393f0b87f3..12417de5102 100644 ---- a/gcc/config/arm/arm.c -+++ b/gcc/config/arm/arm.c -@@ -7379,21 +7379,34 @@ legitimate_pic_operand_p (rtx x) - return 1; - } - --/* Record that the current function needs a PIC register. Initialize -- cfun->machine->pic_reg if we have not already done so. */ -+/* Record that the current function needs a PIC register. If PIC_REG is null, -+ a new pseudo is allocated as PIC register, otherwise PIC_REG is used. In -+ both case cfun->machine->pic_reg is initialized if we have not already done -+ so. COMPUTE_NOW decide whether and where to set the PIC register. If true, -+ PIC register is reloaded in the current position of the instruction stream -+ irregardless of whether it was loaded before. Otherwise, it is only loaded -+ if not already done so (crtl->uses_pic_offset_table is null). Note that -+ nonnull PIC_REG is only supported iff COMPUTE_NOW is true and null PIC_REG -+ is only supported iff COMPUTE_NOW is false. */ - - static void --require_pic_register (void) -+require_pic_register (rtx pic_reg, bool compute_now) - { -+ gcc_assert (compute_now == (pic_reg != NULL_RTX)); -+ - /* A lot of the logic here is made obscure by the fact that this - routine gets called as part of the rtx cost estimation process. - We don't want those calls to affect any assumptions about the real - function; and further, we can't call entry_of_function() until we - start the real expansion process. */ -- if (!crtl->uses_pic_offset_table) -+ if (!crtl->uses_pic_offset_table || compute_now) - { -- gcc_assert (can_create_pseudo_p ()); -+ gcc_assert (can_create_pseudo_p () -+ || (pic_reg != NULL_RTX -+ && REG_P (pic_reg) -+ && GET_MODE (pic_reg) == Pmode)); - if (arm_pic_register != INVALID_REGNUM -+ && !compute_now - && !(TARGET_THUMB1 && arm_pic_register > LAST_LO_REGNUM)) - { - if (!cfun->machine->pic_reg) -@@ -7409,8 +7422,10 @@ require_pic_register (void) - { - rtx_insn *seq, *insn; - -+ if (pic_reg == NULL_RTX) -+ pic_reg = gen_reg_rtx (Pmode); - if (!cfun->machine->pic_reg) -- cfun->machine->pic_reg = gen_reg_rtx (Pmode); -+ cfun->machine->pic_reg = pic_reg; - - /* Play games to avoid marking the function as needing pic - if we are being called as part of the cost-estimation -@@ -7421,11 +7436,12 @@ require_pic_register (void) - start_sequence (); - - if (TARGET_THUMB1 && arm_pic_register != INVALID_REGNUM -- && arm_pic_register > LAST_LO_REGNUM) -+ && arm_pic_register > LAST_LO_REGNUM -+ && !compute_now) - emit_move_insn (cfun->machine->pic_reg, - gen_rtx_REG (Pmode, arm_pic_register)); - else -- arm_load_pic_register (0UL); -+ arm_load_pic_register (0UL, pic_reg); - - seq = get_insns (); - end_sequence (); -@@ -7438,16 +7454,33 @@ require_pic_register (void) - we can't yet emit instructions directly in the final - insn stream. Queue the insns on the entry edge, they will - be committed after everything else is expanded. */ -- insert_insn_on_edge (seq, -- single_succ_edge (ENTRY_BLOCK_PTR_FOR_FN (cfun))); -+ if (currently_expanding_to_rtl) -+ insert_insn_on_edge (seq, -+ single_succ_edge -+ (ENTRY_BLOCK_PTR_FOR_FN (cfun))); -+ else -+ emit_insn (seq); - } - } - } - } - -+/* Legitimize PIC load to ORIG into REG. If REG is NULL, a new pseudo is -+ created to hold the result of the load. If not NULL, PIC_REG indicates -+ which register to use as PIC register, otherwise it is decided by register -+ allocator. COMPUTE_NOW forces the PIC register to be loaded at the current -+ location in the instruction stream, irregardless of whether it was loaded -+ previously. Note that nonnull PIC_REG is only supported iff COMPUTE_NOW is -+ true and null PIC_REG is only supported iff COMPUTE_NOW is false. -+ -+ Returns the register REG into which the PIC load is performed. */ -+ - rtx --legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) -+legitimize_pic_address (rtx orig, machine_mode mode, rtx reg, rtx pic_reg, -+ bool compute_now) - { -+ gcc_assert (compute_now == (pic_reg != NULL_RTX)); -+ - if (GET_CODE (orig) == SYMBOL_REF - || GET_CODE (orig) == LABEL_REF) - { -@@ -7480,9 +7513,12 @@ legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) - rtx mem; - - /* If this function doesn't have a pic register, create one now. */ -- require_pic_register (); -+ require_pic_register (pic_reg, compute_now); -+ -+ if (pic_reg == NULL_RTX) -+ pic_reg = cfun->machine->pic_reg; - -- pat = gen_calculate_pic_address (reg, cfun->machine->pic_reg, orig); -+ pat = gen_calculate_pic_address (reg, pic_reg, orig); - - /* Make the MEM as close to a constant as possible. */ - mem = SET_SRC (pat); -@@ -7531,9 +7567,11 @@ legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) - - gcc_assert (GET_CODE (XEXP (orig, 0)) == PLUS); - -- base = legitimize_pic_address (XEXP (XEXP (orig, 0), 0), Pmode, reg); -+ base = legitimize_pic_address (XEXP (XEXP (orig, 0), 0), Pmode, reg, -+ pic_reg, compute_now); - offset = legitimize_pic_address (XEXP (XEXP (orig, 0), 1), Pmode, -- base == reg ? 0 : reg); -+ base == reg ? 0 : reg, pic_reg, -+ compute_now); - - if (CONST_INT_P (offset)) - { -@@ -7633,16 +7671,17 @@ static GTY(()) int pic_labelno; - low register. */ - - void --arm_load_pic_register (unsigned long saved_regs ATTRIBUTE_UNUSED) -+arm_load_pic_register (unsigned long saved_regs ATTRIBUTE_UNUSED, rtx pic_reg) - { -- rtx l1, labelno, pic_tmp, pic_rtx, pic_reg; -+ rtx l1, labelno, pic_tmp, pic_rtx; - - if (crtl->uses_pic_offset_table == 0 || TARGET_SINGLE_PIC_BASE) - return; - - gcc_assert (flag_pic); - -- pic_reg = cfun->machine->pic_reg; -+ if (pic_reg == NULL_RTX) -+ pic_reg = cfun->machine->pic_reg; - if (TARGET_VXWORKS_RTP) - { - pic_rtx = gen_rtx_SYMBOL_REF (Pmode, VXWORKS_GOTT_BASE); -@@ -8718,7 +8757,8 @@ arm_legitimize_address (rtx x, rtx orig_x, machine_mode mode) - { - /* We need to find and carefully transform any SYMBOL and LABEL - references; so go back to the original address expression. */ -- rtx new_x = legitimize_pic_address (orig_x, mode, NULL_RTX); -+ rtx new_x = legitimize_pic_address (orig_x, mode, NULL_RTX, NULL_RTX, -+ false /*compute_now*/); - - if (new_x != orig_x) - x = new_x; -@@ -8786,7 +8826,8 @@ thumb_legitimize_address (rtx x, rtx orig_x, machine_mode mode) - { - /* We need to find and carefully transform any SYMBOL and LABEL - references; so go back to the original address expression. */ -- rtx new_x = legitimize_pic_address (orig_x, mode, NULL_RTX); -+ rtx new_x = legitimize_pic_address (orig_x, mode, NULL_RTX, NULL_RTX, -+ false /*compute_now*/); - - if (new_x != orig_x) - x = new_x; -@@ -18074,7 +18115,7 @@ arm_emit_call_insn (rtx pat, rtx addr, bool sibcall) - ? !targetm.binds_local_p (SYMBOL_REF_DECL (addr)) - : !SYMBOL_REF_LOCAL_P (addr))) - { -- require_pic_register (); -+ require_pic_register (NULL_RTX, false /*compute_now*/); - use_reg (&CALL_INSN_FUNCTION_USAGE (insn), cfun->machine->pic_reg); - } - -@@ -22006,7 +22047,7 @@ arm_expand_prologue (void) - mask &= THUMB2_WORK_REGS; - if (!IS_NESTED (func_type)) - mask |= (1 << IP_REGNUM); -- arm_load_pic_register (mask); -+ arm_load_pic_register (mask, NULL_RTX); - } - - /* If we are profiling, make sure no instructions are scheduled before -@@ -25237,7 +25278,7 @@ thumb1_expand_prologue (void) - /* Load the pic register before setting the frame pointer, - so we can use r7 as a temporary work register. */ - if (flag_pic && arm_pic_register != INVALID_REGNUM) -- arm_load_pic_register (live_regs_mask); -+ arm_load_pic_register (live_regs_mask, NULL_RTX); - - if (!frame_pointer_needed && CALLER_INTERWORKING_SLOT_SIZE > 0) - emit_move_insn (gen_rtx_REG (Pmode, ARM_HARD_FRAME_POINTER_REGNUM), -diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md -index c8dc9474b1b..f6196e93168 100644 ---- a/gcc/config/arm/arm.md -+++ b/gcc/config/arm/arm.md -@@ -6021,7 +6021,8 @@ - operands[1] = legitimize_pic_address (operands[1], SImode, - (!can_create_pseudo_p () - ? operands[0] -- : 0)); -+ : NULL_RTX), NULL_RTX, -+ false /*compute_now*/); - } - " - ) -@@ -6309,7 +6310,7 @@ - /* r3 is clobbered by set/longjmp, so we can use it as a scratch - register. */ - if (arm_pic_register != INVALID_REGNUM) -- arm_load_pic_register (1UL << 3); -+ arm_load_pic_register (1UL << 3, NULL_RTX); - DONE; - }") - -@@ -8634,6 +8635,164 @@ - (set_attr "conds" "clob")] - ) - -+;; Named patterns for stack smashing protection. -+(define_expand "stack_protect_combined_set" -+ [(parallel -+ [(set (match_operand:SI 0 "memory_operand" "") -+ (unspec:SI [(match_operand:SI 1 "guard_operand" "")] -+ UNSPEC_SP_SET)) -+ (clobber (match_scratch:SI 2 "")) -+ (clobber (match_scratch:SI 3 ""))])] -+ "" -+ "" -+) -+ -+;; Use a separate insn from the above expand to be able to have the mem outside -+;; the operand #1 when register allocation comes. This is needed to avoid LRA -+;; try to reload the guard since we need to control how PIC access is done in -+;; the -fpic/-fPIC case (see COMPUTE_NOW parameter when calling -+;; legitimize_pic_address ()). -+(define_insn_and_split "*stack_protect_combined_set_insn" -+ [(set (match_operand:SI 0 "memory_operand" "=m,m") -+ (unspec:SI [(mem:SI (match_operand:SI 1 "guard_addr_operand" "X,X"))] -+ UNSPEC_SP_SET)) -+ (clobber (match_scratch:SI 2 "=&l,&r")) -+ (clobber (match_scratch:SI 3 "=&l,&r"))] -+ "" -+ "#" -+ "reload_completed" -+ [(parallel [(set (match_dup 0) (unspec:SI [(mem:SI (match_dup 2))] -+ UNSPEC_SP_SET)) -+ (clobber (match_dup 2))])] -+ " -+{ -+ if (flag_pic) -+ { -+ /* Forces recomputing of GOT base now. */ -+ legitimize_pic_address (operands[1], SImode, operands[2], operands[3], -+ true /*compute_now*/); -+ } -+ else -+ { -+ if (address_operand (operands[1], SImode)) -+ operands[2] = operands[1]; -+ else -+ { -+ rtx mem = XEXP (force_const_mem (SImode, operands[1]), 0); -+ emit_move_insn (operands[2], mem); -+ } -+ } -+}" -+ [(set_attr "arch" "t1,32")] -+) -+ -+(define_insn "*stack_protect_set_insn" -+ [(set (match_operand:SI 0 "memory_operand" "=m,m") -+ (unspec:SI [(mem:SI (match_operand:SI 1 "register_operand" "+&l,&r"))] -+ UNSPEC_SP_SET)) -+ (clobber (match_dup 1))] -+ "" -+ "@ -+ ldr\\t%1, [%1]\;str\\t%1, %0\;movs\t%1,#0 -+ ldr\\t%1, [%1]\;str\\t%1, %0\;mov\t%1,#0" -+ [(set_attr "length" "8,12") -+ (set_attr "conds" "clob,nocond") -+ (set_attr "type" "multiple") -+ (set_attr "arch" "t1,32")] -+) -+ -+(define_expand "stack_protect_combined_test" -+ [(parallel -+ [(set (pc) -+ (if_then_else -+ (eq (match_operand:SI 0 "memory_operand" "") -+ (unspec:SI [(match_operand:SI 1 "guard_operand" "")] -+ UNSPEC_SP_TEST)) -+ (label_ref (match_operand 2)) -+ (pc))) -+ (clobber (match_scratch:SI 3 "")) -+ (clobber (match_scratch:SI 4 "")) -+ (clobber (reg:CC CC_REGNUM))])] -+ "" -+ "" -+) -+ -+;; Use a separate insn from the above expand to be able to have the mem outside -+;; the operand #1 when register allocation comes. This is needed to avoid LRA -+;; try to reload the guard since we need to control how PIC access is done in -+;; the -fpic/-fPIC case (see COMPUTE_NOW parameter when calling -+;; legitimize_pic_address ()). -+(define_insn_and_split "*stack_protect_combined_test_insn" -+ [(set (pc) -+ (if_then_else -+ (eq (match_operand:SI 0 "memory_operand" "m,m") -+ (unspec:SI [(mem:SI (match_operand:SI 1 "guard_addr_operand" "X,X"))] -+ UNSPEC_SP_TEST)) -+ (label_ref (match_operand 2)) -+ (pc))) -+ (clobber (match_scratch:SI 3 "=&l,&r")) -+ (clobber (match_scratch:SI 4 "=&l,&r")) -+ (clobber (reg:CC CC_REGNUM))] -+ "" -+ "#" -+ "reload_completed" -+ [(const_int 0)] -+{ -+ rtx eq; -+ -+ if (flag_pic) -+ { -+ /* Forces recomputing of GOT base now. */ -+ legitimize_pic_address (operands[1], SImode, operands[3], operands[4], -+ true /*compute_now*/); -+ } -+ else -+ { -+ if (address_operand (operands[1], SImode)) -+ operands[3] = operands[1]; -+ else -+ { -+ rtx mem = XEXP (force_const_mem (SImode, operands[1]), 0); -+ emit_move_insn (operands[3], mem); -+ } -+ } -+ if (TARGET_32BIT) -+ { -+ emit_insn (gen_arm_stack_protect_test_insn (operands[4], operands[0], -+ operands[3])); -+ rtx cc_reg = gen_rtx_REG (CC_Zmode, CC_REGNUM); -+ eq = gen_rtx_EQ (CC_Zmode, cc_reg, const0_rtx); -+ emit_jump_insn (gen_arm_cond_branch (operands[2], eq, cc_reg)); -+ } -+ else -+ { -+ emit_insn (gen_thumb1_stack_protect_test_insn (operands[4], operands[0], -+ operands[3])); -+ eq = gen_rtx_EQ (VOIDmode, operands[4], const0_rtx); -+ emit_jump_insn (gen_cbranchsi4 (eq, operands[4], const0_rtx, -+ operands[2])); -+ } -+ DONE; -+} -+ [(set_attr "arch" "t1,32")] -+) -+ -+(define_insn "arm_stack_protect_test_insn" -+ [(set (reg:CC_Z CC_REGNUM) -+ (compare:CC_Z (unspec:SI [(match_operand:SI 1 "memory_operand" "m,m") -+ (mem:SI (match_operand:SI 2 "register_operand" "+l,r"))] -+ UNSPEC_SP_TEST) -+ (const_int 0))) -+ (clobber (match_operand:SI 0 "register_operand" "=&l,&r")) -+ (clobber (match_dup 2))] -+ "TARGET_32BIT" -+ "ldr\t%0, [%2]\;ldr\t%2, %1\;eors\t%0, %2, %0" -+ [(set_attr "length" "8,12") -+ (set_attr "conds" "set") -+ (set_attr "type" "multiple") -+ (set_attr "arch" "t,32")] -+) -+ - (define_expand "casesi" - [(match_operand:SI 0 "s_register_operand" "") ; index to jump on - (match_operand:SI 1 "const_int_operand" "") ; lower bound -diff --git a/gcc/config/arm/predicates.md b/gcc/config/arm/predicates.md -index 7e198f9bce4..69718ee9c7a 100644 ---- a/gcc/config/arm/predicates.md -+++ b/gcc/config/arm/predicates.md -@@ -31,6 +31,23 @@ - || REGNO_REG_CLASS (REGNO (op)) != NO_REGS)); - }) - -+; Predicate for stack protector guard's address in -+; stack_protect_combined_set_insn and stack_protect_combined_test_insn patterns -+(define_predicate "guard_addr_operand" -+ (match_test "true") -+{ -+ return (CONSTANT_ADDRESS_P (op) -+ || !targetm.cannot_force_const_mem (mode, op)); -+}) -+ -+; Predicate for stack protector guard in stack_protect_combined_set and -+; stack_protect_combined_test patterns -+(define_predicate "guard_operand" -+ (match_code "mem") -+{ -+ return guard_addr_operand (XEXP (op, 0), mode); -+}) -+ - (define_predicate "imm_for_neon_inv_logic_operand" - (match_code "const_vector") - { -diff --git a/gcc/config/arm/thumb1.md b/gcc/config/arm/thumb1.md -index 19dcdbcdd73..cd199c9c529 100644 ---- a/gcc/config/arm/thumb1.md -+++ b/gcc/config/arm/thumb1.md -@@ -1962,4 +1962,17 @@ - }" - [(set_attr "type" "mov_reg")] - ) -+ -+(define_insn "thumb1_stack_protect_test_insn" -+ [(set (match_operand:SI 0 "register_operand" "=&l") -+ (unspec:SI [(match_operand:SI 1 "memory_operand" "m") -+ (mem:SI (match_operand:SI 2 "register_operand" "+l"))] -+ UNSPEC_SP_TEST)) -+ (clobber (match_dup 2))] -+ "TARGET_THUMB1" -+ "ldr\t%0, [%2]\;ldr\t%2, %1\;eors\t%0, %2, %0" -+ [(set_attr "length" "8") -+ (set_attr "conds" "set") -+ (set_attr "type" "multiple")] -+) - -diff --git a/gcc/config/arm/unspecs.md b/gcc/config/arm/unspecs.md -index 19416736ef9..8f9dbcb08dc 100644 ---- a/gcc/config/arm/unspecs.md -+++ b/gcc/config/arm/unspecs.md -@@ -86,6 +86,9 @@ - UNSPEC_PROBE_STACK ; Probe stack memory reference - UNSPEC_NONSECURE_MEM ; Represent non-secure memory in ARMv8-M with - ; security extension -+ UNSPEC_SP_SET ; Represent the setting of stack protector's canary -+ UNSPEC_SP_TEST ; Represent the testing of stack protector's canary -+ ; against the guard. - ]) - - (define_c_enum "unspec" [ -diff --git a/gcc/doc/md.texi b/gcc/doc/md.texi -index 295fc1f1143..895309b2f3c 100644 ---- a/gcc/doc/md.texi -+++ b/gcc/doc/md.texi -@@ -7450,22 +7450,61 @@ builtins. - The get/set patterns have a single output/input operand respectively, - with @var{mode} intended to be @code{Pmode}. - -+@cindex @code{stack_protect_combined_set} instruction pattern -+@item @samp{stack_protect_combined_set} -+This pattern, if defined, moves a @code{ptr_mode} value from an address -+whose declaration RTX is given in operand 1 to the memory in operand 0 -+without leaving the value in a register afterward. If several -+instructions are needed by the target to perform the operation (eg. to -+load the address from a GOT entry then load the @code{ptr_mode} value -+and finally store it), it is the backend's responsibility to ensure no -+intermediate result gets spilled. This is to avoid leaking the value -+some place that an attacker might use to rewrite the stack guard slot -+after having clobbered it. -+ -+If this pattern is not defined, then the address declaration is -+expanded first in the standard way and a @code{stack_protect_set} -+pattern is then generated to move the value from that address to the -+address in operand 0. -+ - @cindex @code{stack_protect_set} instruction pattern - @item @samp{stack_protect_set} --This pattern, if defined, moves a @code{ptr_mode} value from the memory --in operand 1 to the memory in operand 0 without leaving the value in --a register afterward. This is to avoid leaking the value some place --that an attacker might use to rewrite the stack guard slot after --having clobbered it. -+This pattern, if defined, moves a @code{ptr_mode} value from the valid -+memory location in operand 1 to the memory in operand 0 without leaving -+the value in a register afterward. This is to avoid leaking the value -+some place that an attacker might use to rewrite the stack guard slot -+after having clobbered it. -+ -+Note: on targets where the addressing modes do not allow to load -+directly from stack guard address, the address is expanded in a standard -+way first which could cause some spills. - - If this pattern is not defined, then a plain move pattern is generated. - -+@cindex @code{stack_protect_combined_test} instruction pattern -+@item @samp{stack_protect_combined_test} -+This pattern, if defined, compares a @code{ptr_mode} value from an -+address whose declaration RTX is given in operand 1 with the memory in -+operand 0 without leaving the value in a register afterward and -+branches to operand 2 if the values were equal. If several -+instructions are needed by the target to perform the operation (eg. to -+load the address from a GOT entry then load the @code{ptr_mode} value -+and finally store it), it is the backend's responsibility to ensure no -+intermediate result gets spilled. This is to avoid leaking the value -+some place that an attacker might use to rewrite the stack guard slot -+after having clobbered it. -+ -+If this pattern is not defined, then the address declaration is -+expanded first in the standard way and a @code{stack_protect_test} -+pattern is then generated to compare the value from that address to the -+value at the memory in operand 0. -+ - @cindex @code{stack_protect_test} instruction pattern - @item @samp{stack_protect_test} - This pattern, if defined, compares a @code{ptr_mode} value from the --memory in operand 1 with the memory in operand 0 without leaving the --value in a register afterward and branches to operand 2 if the values --were equal. -+valid memory location in operand 1 with the memory in operand 0 without -+leaving the value in a register afterward and branches to operand 2 if -+the values were equal. - - If this pattern is not defined, then a plain compare pattern and - conditional branch pattern is used. -diff --git a/gcc/function.c b/gcc/function.c -index 85a5d9f43f7..69523c1d723 100644 ---- a/gcc/function.c -+++ b/gcc/function.c -@@ -4937,18 +4937,34 @@ stack_protect_epilogue (void) - tree guard_decl = targetm.stack_protect_guard (); - rtx_code_label *label = gen_label_rtx (); - rtx x, y; -- rtx_insn *seq; -+ rtx_insn *seq = NULL; - - x = expand_normal (crtl->stack_protect_guard); -- if (guard_decl) -- y = expand_normal (guard_decl); -+ -+ if (targetm.have_stack_protect_combined_test () && guard_decl) -+ { -+ gcc_assert (DECL_P (guard_decl)); -+ y = DECL_RTL (guard_decl); -+ /* Allow the target to compute address of Y and compare it with X without -+ leaking Y into a register. This combined address + compare pattern -+ allows the target to prevent spilling of any intermediate results by -+ splitting it after register allocator. */ -+ seq = targetm.gen_stack_protect_combined_test (x, y, label); -+ } - else -- y = const0_rtx; -+ { -+ if (guard_decl) -+ y = expand_normal (guard_decl); -+ else -+ y = const0_rtx; -+ -+ /* Allow the target to compare Y with X without leaking either into -+ a register. */ -+ if (targetm.have_stack_protect_test ()) -+ seq = targetm.gen_stack_protect_test (x, y, label); -+ } - -- /* Allow the target to compare Y with X without leaking either into -- a register. */ -- if (targetm.have_stack_protect_test () -- && ((seq = targetm.gen_stack_protect_test (x, y, label)) != NULL_RTX)) -+ if (seq) - emit_insn (seq); - else - emit_cmp_and_jump_insns (x, y, EQ, NULL_RTX, ptr_mode, 1, label); -diff --git a/gcc/target-insns.def b/gcc/target-insns.def -index 9a552c3d11c..d39889b3522 100644 ---- a/gcc/target-insns.def -+++ b/gcc/target-insns.def -@@ -96,7 +96,9 @@ DEF_TARGET_INSN (sibcall_value, (rtx x0, rtx x1, rtx opt2, rtx opt3, - DEF_TARGET_INSN (simple_return, (void)) - DEF_TARGET_INSN (split_stack_prologue, (void)) - DEF_TARGET_INSN (split_stack_space_check, (rtx x0, rtx x1)) -+DEF_TARGET_INSN (stack_protect_combined_set, (rtx x0, rtx x1)) - DEF_TARGET_INSN (stack_protect_set, (rtx x0, rtx x1)) -+DEF_TARGET_INSN (stack_protect_combined_test, (rtx x0, rtx x1, rtx x2)) - DEF_TARGET_INSN (stack_protect_test, (rtx x0, rtx x1, rtx x2)) - DEF_TARGET_INSN (store_multiple, (rtx x0, rtx x1, rtx x2)) - DEF_TARGET_INSN (tablejump, (rtx x0, rtx x1)) --- -2.21.0 diff --git a/poky/meta/recipes-devtools/gcc/gcc-8.3/CVE-2019-14250.patch b/poky/meta/recipes-devtools/gcc/gcc-8.3/CVE-2019-14250.patch new file mode 100644 index 000000000..e327684e1 --- /dev/null +++ b/poky/meta/recipes-devtools/gcc/gcc-8.3/CVE-2019-14250.patch @@ -0,0 +1,44 @@ +From a4f1b58eb48b349a5f353bc69c30be553506d33b Mon Sep 17 00:00:00 2001 +From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Thu, 25 Jul 2019 10:48:26 +0000 +Subject: [PATCH] 2019-07-25 Richard Biener <rguenther@suse.de> + + PR lto/90924 + Backport from mainline + 2019-07-12 Ren Kimura <rkx1209dev@gmail.com> + + * simple-object-elf.c (simple_object_elf_match): Check zero value + shstrndx. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-8-branch@273794 138bc75d-0d04-0410-961f-82ee72b054a4 + +Upstream-Status: Backport +Affectes: < 9.2 +CVE: CVE-2019-14250 +Dropped changelog +Signed-off-by: Armin Kuster <Akustre@mvista.com> + +--- + libiberty/simple-object-elf.c | 8 ++++++++ + 2 files changed, 17 insertions(+) + +Index: gcc-8.2.0/libiberty/simple-object-elf.c +=================================================================== +--- gcc-8.2.0.orig/libiberty/simple-object-elf.c ++++ gcc-8.2.0/libiberty/simple-object-elf.c +@@ -549,6 +549,14 @@ simple_object_elf_match (unsigned char h + return NULL; + } + ++ if (eor->shstrndx == 0) ++ { ++ *errmsg = "invalid ELF shstrndx == 0"; ++ *err = 0; ++ XDELETE (eor); ++ return NULL; ++ } ++ + return (void *) eor; + } + diff --git a/poky/meta/recipes-devtools/gcc/gcc-9.2.inc b/poky/meta/recipes-devtools/gcc/gcc-9.2.inc index 1c3e200da..01d3bf0f3 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-9.2.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-9.2.inc @@ -64,6 +64,7 @@ SRC_URI = "\ file://0034-fix-segmentation-fault-in-precompiled-header-generat.patch \ file://0035-Fix-for-testsuite-failure.patch \ file://0036-Re-introduce-spe-commandline-options.patch \ + file://CVE-2019-14250.patch \ " S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" SRC_URI[md5sum] = "3818ad8600447f05349098232c2ddc78" diff --git a/poky/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/poky/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch index 21908bce9..66fb24d4c 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch +++ b/poky/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch @@ -1,7 +1,7 @@ -From a93743732b2125aebd9a6d65e999d7506b01d6b3 Mon Sep 17 00:00:00 2001 +From 72fc3975bcd720b2f8040fa87cd23d3db4c5975a Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 29 Mar 2013 09:24:50 +0400 -Subject: [PATCH 11/36] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER +Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER relative to SYSTEMLIBS_DIR This patch defines GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER @@ -23,11 +23,12 @@ Upstream-Status: Inappropriate [OE configuration] gcc/config/i386/linux64.h | 6 +++--- gcc/config/linux.h | 8 ++++---- gcc/config/mips/linux.h | 12 ++++++------ + gcc/config/riscv/linux.h | 2 +- gcc/config/rs6000/linux64.h | 15 +++++---------- gcc/config/sh/linux.h | 2 +- gcc/config/sparc/linux.h | 2 +- gcc/config/sparc/linux64.h | 4 ++-- - 11 files changed, 28 insertions(+), 33 deletions(-) + 12 files changed, 29 insertions(+), 34 deletions(-) diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h index 824861befec..6afacce3292 100644 @@ -152,6 +153,19 @@ index 6f79ac9c01a..25de96f9561 100644 #undef MUSL_DYNAMIC_LINKER32 #define MUSL_DYNAMIC_LINKER32 \ +diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h +index 58dd18b89f3..112ba9cd764 100644 +--- a/gcc/config/riscv/linux.h ++++ b/gcc/config/riscv/linux.h +@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see + GNU_USER_TARGET_OS_CPP_BUILTINS(); \ + } while (0) + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1" ++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1" + + #define MUSL_ABI_SUFFIX \ + "%{mabi=ilp32:-sf}" \ diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h index 9946d3fed94..45a9a7cae59 100644 --- a/gcc/config/rs6000/linux64.h @@ -227,6 +241,3 @@ index 789d1df4bd5..b920c680fb1 100644 #ifdef SPARC_BI_ARCH --- -2.22.1 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch b/poky/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch index af0ea5c60..53f9e99d0 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch +++ b/poky/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch @@ -22,8 +22,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> gcc/gcc.c | 7 ------- 4 files changed, 15 insertions(+), 7 deletions(-) -diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 0064a282488..98d1488171f 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -618,6 +618,7 @@ libexecdir = @libexecdir@ @@ -34,7 +32,7 @@ index 0064a282488..98d1488171f 100644 # Directory in which the compiler finds executables libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) # Directory in which all plugin resources are installed -@@ -2866,6 +2867,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" +@@ -2866,6 +2867,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localed PREPROCESSOR_DEFINES = \ -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ @@ -42,11 +40,9 @@ index 0064a282488..98d1488171f 100644 -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ -diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c -index c4796385643..980e2bd47a7 100644 --- a/gcc/cppdefault.c +++ b/gcc/cppdefault.c -@@ -59,6 +59,10 @@ const struct default_include cpp_include_defaults[] +@@ -59,6 +59,10 @@ const struct default_include cpp_include /* This is the dir for gcc's private headers. */ { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, #endif @@ -57,42 +53,3 @@ index c4796385643..980e2bd47a7 100644 #ifdef LOCAL_INCLUDE_DIR /* /usr/local/include comes before the fixincluded header files. */ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, -diff --git a/gcc/defaults.h b/gcc/defaults.h -index b7534256119..41ca579b267 100644 ---- a/gcc/defaults.h -+++ b/gcc/defaults.h -@@ -1459,4 +1459,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - #define DWARF_GNAT_ENCODINGS_DEFAULT DWARF_GNAT_ENCODINGS_GDB - #endif - -+/* Default prefixes to attach to command names. */ -+ -+#ifndef STANDARD_STARTFILE_PREFIX_1 -+#define STANDARD_STARTFILE_PREFIX_1 "/lib/" -+#endif -+#ifndef STANDARD_STARTFILE_PREFIX_2 -+#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" -+#endif -+ - #endif /* ! GCC_DEFAULTS_H */ -diff --git a/gcc/gcc.c b/gcc/gcc.c -index 4e7c45b268c..1a3704b2763 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -1470,13 +1470,6 @@ static const char *gcc_libexec_prefix; - - /* Default prefixes to attach to command names. */ - --#ifndef STANDARD_STARTFILE_PREFIX_1 --#define STANDARD_STARTFILE_PREFIX_1 "/lib/" --#endif --#ifndef STANDARD_STARTFILE_PREFIX_2 --#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" --#endif -- - #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ - #undef MD_EXEC_PREFIX - #undef MD_STARTFILE_PREFIX --- -2.22.1 - diff --git a/poky/meta/recipes-devtools/gcc/gcc-9.2/0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch b/poky/meta/recipes-devtools/gcc/gcc-9.2/0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch index f5769bc8e..38eab5a08 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-9.2/0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch +++ b/poky/meta/recipes-devtools/gcc/gcc-9.2/0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch @@ -1,125 +1,79 @@ -From baab61ae3938ee2fa9ec03a20793508516a46dae Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Apr 2016 20:03:28 +0000 -Subject: [PATCH 30/36] libgcc: Add knob to use ldbl-128 on ppc - -musl does not support ldbl 128 so we can not assume -that linux as a whole supports ldbl-128 bits, instead -act upon configure option passed to gcc and assume no -on musl and yes otherwise if no option is passed since -default behaviour is to assume ldbl128 it does not -change the defaults +From 47467f3ab0fb2f2fcede81060fe8bb339d0909eb Mon Sep 17 00:00:00 2001 +From: Szabolcs Nagy <nsz@port70.net> +Date: Wed, 28 Feb 2018 00:54:05 +0000 +Subject: [PATCH 10/12] ldbl128 config Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - libgcc/Makefile.in | 1 + - libgcc/config/rs6000/t-linux | 5 ++++- - libgcc/configure | 18 ++++++++++++++++++ - libgcc/configure.ac | 12 ++++++++++++ - 4 files changed, 35 insertions(+), 1 deletion(-) - mode change 100644 => 100755 libgcc/configure + gcc/configure | 13 +++++++++++++ + gcc/configure.ac | 16 ++++++++++++++-- + 2 files changed, 27 insertions(+), 2 deletions(-) -diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in -index ea390a5bbea..114c7876304 100644 ---- a/libgcc/Makefile.in -+++ b/libgcc/Makefile.in -@@ -50,6 +50,7 @@ unwind_header = @unwind_header@ - md_unwind_header = @md_unwind_header@ - sfp_machine_header = @sfp_machine_header@ - thread_header = @thread_header@ -+with_ldbl128 = @with_ldbl128@ - - host_noncanonical = @host_noncanonical@ - real_host_noncanonical = @real_host_noncanonical@ -diff --git a/libgcc/config/rs6000/t-linux b/libgcc/config/rs6000/t-linux -index 4f6d4c4a4d2..c50dd94a2da 100644 ---- a/libgcc/config/rs6000/t-linux -+++ b/libgcc/config/rs6000/t-linux -@@ -1,3 +1,6 @@ - SHLIB_MAPFILES += $(srcdir)/config/rs6000/libgcc-glibc.ver - --HOST_LIBGCC2_CFLAGS += -mlong-double-128 -mno-minimal-toc -+ifeq ($(with_ldbl128),yes) -+HOST_LIBGCC2_CFLAGS += -mlong-double-128 -+endif -+HOST_LIBGCC2_CFLAGS += -mno-minimal-toc -diff --git a/libgcc/configure b/libgcc/configure -old mode 100644 -new mode 100755 -index 36dbbc1f699..b5dd5c34e2a ---- a/libgcc/configure -+++ b/libgcc/configure -@@ -651,6 +651,7 @@ build_vendor - build_cpu - build - with_aix_soname -+with_ldbl128 - enable_vtable_verify - enable_gcov - enable_shared -@@ -702,6 +703,7 @@ with_ld - enable_shared - enable_gcov - enable_vtable_verify -+with_long_double_128 - with_aix_soname - enable_version_specific_runtime_libs - with_slibdir -@@ -1363,6 +1365,7 @@ Optional Packages: - --with-target-subdir=SUBDIR Configuring in a subdirectory for target - --with-cross-host=HOST Configuring with a cross compiler - --with-ld arrange to use the specified ld (full pathname) -+ --with-long-double-128 use 128-bit long double by default - --with-aix-soname=aix|svr4|both - shared library versioning (aka "SONAME") variant to - provide on AIX -@@ -2268,6 +2271,21 @@ fi - - +diff --git a/gcc/configure b/gcc/configure +index 6121e163259..07ff8597d48 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -29309,6 +29309,15 @@ if test "${with_long_double_128+set}" = set; then : + withval=$with_long_double_128; gcc_cv_target_ldbl128="$with_long_double_128" + else -+# Check whether --with-long-double-128 was given. -+if test "${with_long_double_128+set}" = set; then : -+ withval=$with_long_double_128; with_ldbl128="$with_long_double_128" -+else -+ case "${host}" in -+ power*-*-musl*) -+ with_ldbl128="no";; -+ *) with_ldbl128="yes";; -+ esac -+ -+fi -+ ++ case "$target" in ++ s390*-*-linux-musl*) ++ gcc_cv_target_ldbl128=yes ++ ;; ++ powerpc*-*-linux-musl*) ++ gcc_cv_target_ldbl128=no ++ ;; ++ *) + + if test $glibc_version_major -gt 2 \ + || ( test $glibc_version_major -eq 2 && test $glibc_version_minor -ge 4 ); then : + gcc_cv_target_ldbl128=yes +@@ -29320,6 +29329,10 @@ else + && gcc_cv_target_ldbl128=yes + + fi + ++ ;; ++ esac + - # Check whether --with-aix-soname was given. - if test "${with_aix_soname+set}" = set; then : - withval=$with_aix_soname; case "${host}:${enable_shared}" in -diff --git a/libgcc/configure.ac b/libgcc/configure.ac -index 8e96cafdf8b..9247856bf24 100644 ---- a/libgcc/configure.ac -+++ b/libgcc/configure.ac -@@ -82,6 +82,18 @@ AC_ARG_ENABLE(vtable-verify, - [enable_vtable_verify=no]) - AC_SUBST(enable_vtable_verify) + fi -+AC_ARG_WITH(long-double-128, -+[AS_HELP_STRING([--with-long-double-128], -+ [use 128-bit long double by default])], -+ with_ldbl128="$with_long_double_128", -+[case "${host}" in -+ power*-*-musl*) -+ with_ldbl128="no";; -+ *) with_ldbl128="yes";; -+ esac -+]) -+AC_SUBST(with_ldbl128) -+ - AC_ARG_WITH(aix-soname, - [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], - [shared library versioning (aka "SONAME") variant to provide on AIX])], + ;; +diff --git a/gcc/configure.ac b/gcc/configure.ac +index b066cc609e1..6c15ed898c0 100644 +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -5971,13 +5971,25 @@ case "$target" in + AC_ARG_WITH(long-double-128, + [AS_HELP_STRING([--with-long-double-128], + [use 128-bit long double by default])], +- gcc_cv_target_ldbl128="$with_long_double_128", ++ gcc_cv_target_ldbl128="$with_long_double_128", [ ++ case "$target" in ++ s390*-*-linux-musl*) ++ gcc_cv_target_ldbl128=yes ++ ;; ++ powerpc*-*-linux-musl*) ++ gcc_cv_target_ldbl128=no ++ ;; ++ *)] + [GCC_GLIBC_VERSION_GTE_IFELSE([2], [4], [gcc_cv_target_ldbl128=yes], [ + [gcc_cv_target_ldbl128=no + grep '^[ ]*#[ ]*define[ ][ ]*__LONG_DOUBLE_MATH_OPTIONAL' \ + $target_header_dir/bits/wordsize.h > /dev/null 2>&1 \ + && gcc_cv_target_ldbl128=yes +- ]])]) ++ ]])] ++ [ ++ ;; ++ esac ++ ]) + ;; + esac + if test x$gcc_cv_target_ldbl128 = xyes; then -- -2.22.1 +2.17.1 diff --git a/poky/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-14250.patch b/poky/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-14250.patch new file mode 100644 index 000000000..65ea34558 --- /dev/null +++ b/poky/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-14250.patch @@ -0,0 +1,44 @@ +From 517b211a3d78366ca8d5929f580e8ca72fd2c004 Mon Sep 17 00:00:00 2001 +From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Thu, 25 Jul 2019 10:46:54 +0000 +Subject: [PATCH] 2019-07-25 Richard Biener <rguenther@suse.de> + + PR lto/90924 + Backport from mainline + 2019-07-12 Ren Kimura <rkx1209dev@gmail.com> + + * simple-object-elf.c (simple_object_elf_match): Check zero value + shstrndx. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@273793 138bc75d-0d04-0410-961f-82ee72b054a4 + +Upstream-Status: Backport +Affectes: < 9.2 +CVE: CVE-2019-14250 +Dropped changelog +Signed-off-by: Armin Kuster <Akustre@mvista.com> + +--- + libiberty/simple-object-elf.c | 8 ++++++++ + 2 files changed, 17 insertions(+) + +Index: gcc-9.2.0/libiberty/simple-object-elf.c +=================================================================== +--- gcc-9.2.0.orig/libiberty/simple-object-elf.c ++++ gcc-9.2.0/libiberty/simple-object-elf.c +@@ -557,6 +557,14 @@ simple_object_elf_match (unsigned char h + return NULL; + } + ++ if (eor->shstrndx == 0) ++ { ++ *errmsg = "invalid ELF shstrndx == 0"; ++ *err = 0; ++ XDELETE (eor); ++ return NULL; ++ } ++ + return (void *) eor; + } + diff --git a/poky/meta/recipes-devtools/gcc/gcc-common.inc b/poky/meta/recipes-devtools/gcc/gcc-common.inc index 96334e54b..44cba287f 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-common.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-common.inc @@ -17,7 +17,7 @@ python extract_stashed_builddir () { src = d.expand("${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}") dest = d.getVar("B") oe.path.copyhardlinktree(src, dest) - staging_processfixme([src + "/fixmepath"], dest, dest, dest, d) + staging_processfixme([src + "/fixmepath"], dest, d.getVar("RECIPE_SYSROOT"), d.getVar("RECIPE_SYSROOT_NATIVE"), d) } def get_gcc_float_setting(bb, d): @@ -41,13 +41,6 @@ def get_gcc_ppc_plt_settings(bb, d): return "--enable-secureplt" return "" -def get_long_double_setting(bb, d): - if d.getVar('TRANSLATED_TARGET_ARCH') in [ 'powerpc', 'powerpc64' ] and d.getVar('TCLIBC') in [ 'glibc' ]: - return "--with-long-double-128" - else: - return "--without-long-double-128 libgcc_cv_powerpc_float128=no" - return "" - def get_gcc_multiarch_setting(bb, d): target_arch = d.getVar('TRANSLATED_TARGET_ARCH') multiarch_options = { diff --git a/poky/meta/recipes-devtools/gcc/gcc-configure-common.inc b/poky/meta/recipes-devtools/gcc/gcc-configure-common.inc index b6f2ca541..24ba8ce75 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-configure-common.inc @@ -36,7 +36,6 @@ EXTRA_OECONF = "\ ${EXTRA_OECONF_PATHS} \ ${@get_gcc_mips_plt_setting(bb, d)} \ ${@get_gcc_ppc_plt_settings(bb, d)} \ - ${@get_long_double_setting(bb, d)} \ ${@get_gcc_multiarch_setting(bb, d)} \ " diff --git a/poky/meta/recipes-devtools/gcc/gcc-cross-canadian_8.3.bb b/poky/meta/recipes-devtools/gcc/gcc-cross-canadian_8.3.bb deleted file mode 100644 index bf53c5cd7..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-cross-canadian_8.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require recipes-devtools/gcc/gcc-${PV}.inc -require gcc-cross-canadian.inc - - - diff --git a/poky/meta/recipes-devtools/gcc/gcc-cross.inc b/poky/meta/recipes-devtools/gcc/gcc-cross.inc index 6222c2e8c..95af6d89a 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-cross.inc @@ -196,6 +196,8 @@ do_install () { # We use libiberty from binutils find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f + + find ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed -type f -not -name "README" -not -name limits.h -not -name syslimits.h | xargs rm -f } do_package[noexec] = "1" @@ -210,6 +212,9 @@ do_gcc_stash_builddir[cleandirs] = "${BUILDDIRSTASH}" do_gcc_stash_builddir () { dest=${BUILDDIRSTASH} hardlinkdir . $dest + # Makefile does move-if-change which can end up with 'timestamp' as file contents so break links to those files + rm $dest/gcc/include/*.h + cp gcc/include/*.h $dest/gcc/include/ } addtask do_gcc_stash_builddir after do_compile before do_install SSTATETASKS += "do_gcc_stash_builddir" diff --git a/poky/meta/recipes-devtools/gcc/gcc-cross_8.3.bb b/poky/meta/recipes-devtools/gcc/gcc-cross_8.3.bb deleted file mode 100644 index b43cca0c5..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-cross_8.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require recipes-devtools/gcc/gcc-${PV}.inc -require gcc-cross.inc - diff --git a/poky/meta/recipes-devtools/gcc/gcc-crosssdk_8.3.bb b/poky/meta/recipes-devtools/gcc/gcc-crosssdk_8.3.bb deleted file mode 100644 index 40a6c4fef..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-crosssdk_8.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -require recipes-devtools/gcc/gcc-cross_${PV}.bb -require gcc-crosssdk.inc diff --git a/poky/meta/recipes-devtools/gcc/gcc-runtime.inc b/poky/meta/recipes-devtools/gcc/gcc-runtime.inc index 22c1d78dd..2da3c02ef 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-runtime.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-runtime.inc @@ -277,3 +277,45 @@ FILES_libitm-dev = "\ SUMMARY_libitm-dev = "GNU transactional memory support library - development files" FILES_libitm-staticdev = "${libdir}/libitm.a" SUMMARY_libitm-staticdev = "GNU transactional memory support library - static development files" + +require gcc-testsuite.inc + +EXTRA_OEMAKE_prepend_task-check = "${PARALLEL_MAKE} " + +MAKE_CHECK_TARGETS ??= "check-gcc ${@" ".join("check-target-" + i for i in d.getVar("RUNTIMETARGET").split())}" +# prettyprinters and xmethods require gdb tooling +MAKE_CHECK_IGNORE ??= "prettyprinters.exp xmethods.exp" +MAKE_CHECK_RUNTESTFLAGS ??= "${MAKE_CHECK_BOARDARGS} --ignore '${MAKE_CHECK_IGNORE}'" + +# specific host and target dependencies required for test suite running +do_check[depends] += "dejagnu-native:do_populate_sysroot expect-native:do_populate_sysroot" +do_check[depends] += "virtual/libc:do_populate_sysroot" +# only depend on qemu if targeting linux user execution +do_check[depends] += "${@'qemu-native:do_populate_sysroot' if "user" in d.getVar('TOOLCHAIN_TEST_TARGET') else ''}" +# extend the recipe sysroot to include the built libraries (for qemu usermode) +do_check[prefuncs] += "extend_recipe_sysroot" +do_check[prefuncs] += "check_prepare" +do_check[dirs] = "${WORKDIR}/dejagnu ${B}" +do_check[nostamp] = "1" +do_check() { + export DEJAGNU="${WORKDIR}/dejagnu/site.exp" + + # HACK: this works around the configure setting CXX with -nostd* args + sed -i 's/-nostdinc++ -nostdlib++//g' $(find ${B} -name testsuite_flags | head -1) + # HACK: this works around the de-stashing changes to configargs.h, as well as recipe-sysroot changing the content + sed -i '/static const char configuration_arguments/d' ${B}/gcc/configargs.h + ${CC} -v 2>&1 | grep "^Configured with:" | \ + sed 's/Configured with: \(.*\)/static const char configuration_arguments[] = "\1";/g' >> ${B}/gcc/configargs.h + + if [ "${TOOLCHAIN_TEST_TARGET}" = "user" ]; then + # qemu user has issues allocating large amounts of memory + export G_SLICE=always-malloc + # no test should need more that 10G of memory, this prevents tests like pthread7-rope from leaking memory + ulimit -m 4194304 + ulimit -v 10485760 + fi + + oe_runmake -i ${MAKE_CHECK_TARGETS} RUNTESTFLAGS="${MAKE_CHECK_RUNTESTFLAGS}" +} +addtask check after do_compile do_populate_sysroot + diff --git a/poky/meta/recipes-devtools/gcc/gcc-runtime_8.3.bb b/poky/meta/recipes-devtools/gcc/gcc-runtime_8.3.bb deleted file mode 100644 index dd430b57e..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-runtime_8.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -require recipes-devtools/gcc/gcc-${PV}.inc -require gcc-runtime.inc diff --git a/poky/meta/recipes-devtools/gcc/gcc-sanitizers_8.3.bb b/poky/meta/recipes-devtools/gcc/gcc-sanitizers_8.3.bb deleted file mode 100644 index f3c705811..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-sanitizers_8.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require recipes-devtools/gcc/gcc-${PV}.inc -require gcc-sanitizers.inc - -# Building with thumb enabled on armv4t armv5t fails with -# sanitizer_linux.s:5749: Error: lo register required -- `ldr ip,[sp],#8' -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" diff --git a/poky/meta/recipes-devtools/gcc/gcc-source_8.3.bb b/poky/meta/recipes-devtools/gcc/gcc-source_8.3.bb deleted file mode 100644 index b890fa33e..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-source_8.3.bb +++ /dev/null @@ -1,4 +0,0 @@ -require recipes-devtools/gcc/gcc-${PV}.inc -require recipes-devtools/gcc/gcc-source.inc - -EXCLUDE_FROM_WORLD = "1" diff --git a/poky/meta/recipes-devtools/gcc/gcc-testsuite.inc b/poky/meta/recipes-devtools/gcc/gcc-testsuite.inc new file mode 100644 index 000000000..f68fec58e --- /dev/null +++ b/poky/meta/recipes-devtools/gcc/gcc-testsuite.inc @@ -0,0 +1,107 @@ +inherit qemu + +TOOLCHAIN_TEST_TARGET ??= "user" +TOOLCHAIN_TEST_HOST ??= "localhost" +TOOLCHAIN_TEST_HOST_USER ??= "root" +TOOLCHAIN_TEST_HOST_PORT ??= "2222" + +MAKE_CHECK_BOARDFLAGS ??= "" +MAKE_CHECK_BOARDARGS ??= "--target_board=${TOOLCHAIN_TEST_TARGET}${MAKE_CHECK_BOARDFLAGS}" + +python () { + # Provide the targets compiler args via targets options. This allows dejagnu to + # correctly mark incompatible tests as UNSUPPORTED (e.g. needs soft-float + # but running on hard-float target). + # + # These options are called "multilib_flags" within the gcc test suite. Most + # architectures handle these options in a sensible way such that tests that + # are incompatible with the provided multilib are marked as UNSUPPORTED. + # + # Note: multilib flags are added to the compile command after the args + # provided by any test (through dg-options), CFLAGS_FOR_TARGET is always + # added to the compile command before any other args but is not interpted + # as options like multilib flags. + # + # i686, x86-64 and aarch64 are special, since most toolchains built for + # these targets don't do multilib the tests do not get correctly marked as + # UNSUPPORTED. More importantly the test suite itself does not handle + # overriding the multilib flags where it could (like other archs do). As + # such do not pass the target compiler args for these targets. + args = d.getVar("TUNE_CCARGS").split() + if d.getVar("TUNE_ARCH") in ["i686", "x86_64", "aarch64"]: + args = [] + d.setVar("MAKE_CHECK_BOARDFLAGS", ("/" + "/".join(args)) if len(args) != 0 else "") +} + +python check_prepare() { + def generate_qemu_linux_user_config(d): + content = [] + content.append('load_generic_config "sim"') + content.append('load_base_board_description "basic-sim"') + content.append('process_multilib_options ""') + + # qemu args + qemu_binary = qemu_target_binary(d) + if not qemu_binary: + bb.fatal("Missing target qemu linux-user binary") + + args = [] + # QEMU_OPTIONS is not always valid due to -cross recipe + args += ["-r", d.getVar("OLDEST_KERNEL")] + # enable all valid instructions, since the test suite itself does not + # limit itself to the target cpu options. + # - valid for x86*, powerpc, arm, arm64 + if qemu_binary.lstrip("qemu-") in ["x86_64", "i386", "ppc", "arm", "aarch64"]: + args += ["-cpu", "max"] + + sysroot = d.getVar("RECIPE_SYSROOT") + args += ["-L", sysroot] + # lib paths are static here instead of using $libdir since this is used by a -cross recipe + libpaths = [sysroot + "/usr/lib", sysroot + "/lib"] + args += ["-E", "LD_LIBRARY_PATH={0}".format(":".join(libpaths))] + + content.append('set_board_info is_simulator 1') + content.append('set_board_info sim "{0}"'.format(qemu_binary)) + content.append('set_board_info sim,options "{0}"'.format(" ".join(args))) + + # target build/test config + content.append('set_board_info target_install {%s}' % d.getVar("TARGET_SYS")) + content.append('set_board_info ldscript ""') + #content.append('set_board_info needs_status_wrapper 1') # qemu-linux-user return codes work, and abort works fine + content.append('set_board_info gcc,stack_size 16834') + content.append('set_board_info gdb,nosignals 1') + content.append('set_board_info gcc,timeout 60') + + return "\n".join(content) + + def generate_remote_ssh_linux_config(d): + content = [] + content.append('load_generic_config "unix"') + content.append('process_multilib_options ""') + content.append("set_board_info hostname {0}".format(d.getVar("TOOLCHAIN_TEST_HOST"))) + content.append("set_board_info username {0}".format(d.getVar("TOOLCHAIN_TEST_HOST_USER"))) + + port = d.getVar("TOOLCHAIN_TEST_HOST_PORT") + content.append("set_board_info rsh_prog \"/usr/bin/ssh -p {0} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no\"".format(port)) + content.append("set_board_info rcp_prog \"/usr/bin/scp -P {0} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no\"".format(port)) + + return "\n".join(content) + + dejagnudir = d.expand("${WORKDIR}/dejagnu") + if not os.path.isdir(dejagnudir): + os.makedirs(dejagnudir) + + # write out target qemu board config + with open(os.path.join(dejagnudir, "user.exp"), "w") as f: + f.write(generate_qemu_linux_user_config(d)) + + # write out target ssh board config + with open(os.path.join(dejagnudir, "ssh.exp"), "w") as f: + f.write(generate_remote_ssh_linux_config(d)) + + # generate site.exp to provide boards + with open(os.path.join(dejagnudir, "site.exp"), "w") as f: + f.write("lappend boards_dir {0}\n".format(dejagnudir)) + f.write("set CFLAGS_FOR_TARGET \"{0}\"\n".format(d.getVar("TOOLCHAIN_OPTIONS"))) +} + diff --git a/poky/meta/recipes-devtools/gcc/gcc_8.3.bb b/poky/meta/recipes-devtools/gcc/gcc_8.3.bb deleted file mode 100644 index 7d9359058..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc_8.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -require recipes-devtools/gcc/gcc-${PV}.inc -require gcc-target.inc - -# Building with thumb enabled on armv4t armv5t fails with -# | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7438:(.text.unlikely+0x2fa): relocation truncated to fit: R_ARM_THM_CALL against symbol `fancy_abort(char const*, int, char const*)' defined in .glue_7 section in linker stubs -# | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7442:(.text.unlikely+0x318): additional relocation overflows omitted from the output -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" - -ARMFPARCHEXT_armv6 = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" -ARMFPARCHEXT_armv7a = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" -ARMFPARCHEXT_armv7ve = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" - -BBCLASSEXTEND = "nativesdk" diff --git a/poky/meta/recipes-devtools/gcc/libgcc-initial_8.3.bb b/poky/meta/recipes-devtools/gcc/libgcc-initial_8.3.bb deleted file mode 100644 index 0c698c26e..000000000 --- a/poky/meta/recipes-devtools/gcc/libgcc-initial_8.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require recipes-devtools/gcc/gcc-${PV}.inc -require libgcc-initial.inc - -# Building with thumb enabled on armv6t fails -ARM_INSTRUCTION_SET_armv6 = "arm" diff --git a/poky/meta/recipes-devtools/gcc/libgcc_8.3.bb b/poky/meta/recipes-devtools/gcc/libgcc_8.3.bb deleted file mode 100644 index ea210a113..000000000 --- a/poky/meta/recipes-devtools/gcc/libgcc_8.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require recipes-devtools/gcc/gcc-${PV}.inc -require libgcc.inc - -# Building with thumb enabled on armv6t fails -ARM_INSTRUCTION_SET_armv6 = "arm" diff --git a/poky/meta/recipes-devtools/gcc/libgfortran_8.3.bb b/poky/meta/recipes-devtools/gcc/libgfortran_8.3.bb deleted file mode 100644 index 71dd8b4bd..000000000 --- a/poky/meta/recipes-devtools/gcc/libgfortran_8.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require recipes-devtools/gcc/gcc-${PV}.inc -require libgfortran.inc - diff --git a/poky/meta/recipes-devtools/go/go-1.12.inc b/poky/meta/recipes-devtools/go/go-1.12.inc index 3f23f06f0..39157ff88 100644 --- a/poky/meta/recipes-devtools/go/go-1.12.inc +++ b/poky/meta/recipes-devtools/go/go-1.12.inc @@ -1,7 +1,7 @@ require go-common.inc GO_BASEVERSION = "1.12" -GO_MINOR = ".6" +GO_MINOR = ".9" PV .= "${GO_MINOR}" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" @@ -19,5 +19,5 @@ SRC_URI += "\ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" -SRC_URI[main.md5sum] = "48a4141fc718dd742d106431294f08bf" -SRC_URI[main.sha256sum] = "c96c5ccc7455638ae1a8b7498a030fe653731c8391c5f8e79590bce72f92b4ca" +SRC_URI[main.md5sum] = "6132109d4050da349eadc9f7b0304ef4" +SRC_URI[main.sha256sum] = "ab0e56ed9c4732a653ed22e232652709afbf573e710f56a07f7fdeca578d62fc" diff --git a/poky/meta/recipes-devtools/go/go-dep_0.5.0.bb b/poky/meta/recipes-devtools/go/go-dep_0.5.4.bb index a4d631f8e..ead87870e 100644 --- a/poky/meta/recipes-devtools/go/go-dep_0.5.0.bb +++ b/poky/meta/recipes-devtools/go/go-dep_0.5.4.bb @@ -8,8 +8,7 @@ SRC_URI = "git://${GO_IMPORT} \ file://0001-Add-support-for-mips-mips64.patch;patchdir=src/github.com/golang/dep \ " -# Points to 0.5.0 tag -SRCREV = "224a564abe296670b692fe08bb63a3e4c4ad7978" +SRCREV = "1f7c19e5f52f49ffb9f956f64c010be14683468b" inherit go diff --git a/poky/meta/recipes-devtools/help2man/help2man-native_1.47.10.bb b/poky/meta/recipes-devtools/help2man/help2man-native_1.47.11.bb index 5feaeea13..a60e85189 100644 --- a/poky/meta/recipes-devtools/help2man/help2man-native_1.47.10.bb +++ b/poky/meta/recipes-devtools/help2man/help2man-native_1.47.11.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "autoconf-native automake-native" SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "0d70833650a552e0af742882ba84f2ee" -SRC_URI[sha256sum] = "f371cbfd63f879065422b58fa6b81e21870cd791ef6e11d4528608204aa4dcfb" +SRC_URI[md5sum] = "dd322adcaede5bd5eaed075ff8971bc1" +SRC_URI[sha256sum] = "5985b257f86304c8791842c0c807a37541d0d6807ee973000cf8a3fe6ad47b88" inherit autotools native diff --git a/poky/meta/recipes-devtools/libedit/libedit/0001-readline.c-fix-cannot-get-history.patch b/poky/meta/recipes-devtools/libedit/libedit/0001-readline.c-fix-cannot-get-history.patch new file mode 100644 index 000000000..7e54ac97e --- /dev/null +++ b/poky/meta/recipes-devtools/libedit/libedit/0001-readline.c-fix-cannot-get-history.patch @@ -0,0 +1,34 @@ +From ef1fa9bef497d9491a51017f3cad0135a23bb0b4 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 20 Aug 2019 17:33:15 +0800 +Subject: [PATCH] readline.c: fix cannot get history + +if history_offset not increate when add history, +it will make current history event not align with offset, +and cannot get history correctly. + +Upstream-Status: Submitted [tech-userlevel@NetBSD.org] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + src/readline.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/readline.c b/src/readline.c +index 43ac5bd..54b0548 100644 +--- a/src/readline.c ++++ b/src/readline.c +@@ -1476,7 +1476,10 @@ add_history(const char *line) + if (ev.num == history_length) + history_base++; + else ++ { ++ history_offset++; + history_length = ev.num; ++ } + return 0; + } + +-- +2.7.4 + diff --git a/poky/meta/recipes-devtools/libedit/libedit_20190324-3.1.bb b/poky/meta/recipes-devtools/libedit/libedit_20190324-3.1.bb index 6a599ebca..25667ccce 100644 --- a/poky/meta/recipes-devtools/libedit/libedit_20190324-3.1.bb +++ b/poky/meta/recipes-devtools/libedit/libedit_20190324-3.1.bb @@ -10,10 +10,9 @@ DEPENDS = "ncurses" inherit autotools -# upstream site does not allow wget's User-Agent -FETCHCMD_wget += "-U bitbake" SRC_URI = "http://www.thrysoee.dk/editline/${BP}.tar.gz \ file://stdc-predef.patch \ + file://0001-readline.c-fix-cannot-get-history.patch \ " SRC_URI[md5sum] = "bec755c8044ad84b752dfe49a0b371d8" SRC_URI[sha256sum] = "ac8f0f51c1cf65492e4d1e3ed2be360bda41e54633444666422fbf393bba1bae" diff --git a/poky/meta/recipes-devtools/llvm/llvm_git.bb b/poky/meta/recipes-devtools/llvm/llvm_git.bb index 35ad3ced3..08b19a33e 100644 --- a/poky/meta/recipes-devtools/llvm/llvm_git.bb +++ b/poky/meta/recipes-devtools/llvm/llvm_git.bb @@ -71,7 +71,7 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \ -DLLVM_OPTIMIZED_TABLEGEN=ON \ -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS}' \ -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \ - -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python2 \ + -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ -G Ninja" EXTRA_OECMAKE_append_class-target = "\ diff --git a/poky/meta/recipes-devtools/meson/meson.inc b/poky/meta/recipes-devtools/meson/meson.inc index 14e5f8a61..6de109de7 100644 --- a/poky/meta/recipes-devtools/meson/meson.inc +++ b/poky/meta/recipes-devtools/meson/meson.inc @@ -16,10 +16,9 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ file://vala-cross-compile.patch \ - file://0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch \ " -SRC_URI[sha256sum] = "f27b7a60f339ba66fe4b8f81f0d1072e090a08eabbd6aa287683b2c2b9dd2d82" -SRC_URI[md5sum] = "48787e391ec5c052799a3dd491f73909" +SRC_URI[sha256sum] = "23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76" +SRC_URI[md5sum] = "d46c4a8e3cfd27f90e2c6fe4a69e574b" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \ diff --git a/poky/meta/recipes-devtools/meson/meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch b/poky/meta/recipes-devtools/meson/meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch deleted file mode 100644 index 16c6d9076..000000000 --- a/poky/meta/recipes-devtools/meson/meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 15f44be1c7f71cb0a8c6863917acbbc301c621fe Mon Sep 17 00:00:00 2001 -From: Martin Liska <mliska@suse.cz> -Date: Mon, 15 Jul 2019 10:06:17 +0200 -Subject: [PATCH] Fix missing return statements that are seen with - -Werror=return-type. - -Error example: - -Code: - - #include <locale.h> - int main () { - /* If it's not defined as a macro, try to use as a symbol */ - #ifndef LC_MESSAGES - LC_MESSAGES; - #endif - } -Compiler stdout: - -Compiler stderr: - In file included from /usr/include/locale.h:25, - from /tmp/tmpep_i4iwg/testfile.c:2: -/usr/include/features.h:382:4: warning: #warning _FORTIFY_SOURCE -requires compiling with optimization (-O) [-Wcpp] - 382 | # warning _FORTIFY_SOURCE requires compiling with optimization -(-O) - | ^~~~~~~ -/tmp/tmpep_i4iwg/testfile.c: In function 'main': -/tmp/tmpep_i4iwg/testfile.c:8:9: error: control reaches end of non-void -function [-Werror=return-type] - 8 | } - | ^ -cc1: some warnings being treated as errors - -Upstream-Status: Backport -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - mesonbuild/compilers/c.py | 1 + - mesonbuild/compilers/clike.py | 5 +++++ - 2 files changed, 6 insertions(+) - -diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py -index 3b58a076..9ef92077 100644 ---- a/mesonbuild/compilers/c.py -+++ b/mesonbuild/compilers/c.py -@@ -70,6 +70,7 @@ class CCompiler(CLikeCompiler, Compiler): - #ifndef {symbol} - {symbol}; - #endif -+ return 0; - }}''' - return self.compiles(t.format(**fargs), env, extra_args=extra_args, - dependencies=dependencies) -diff --git a/mesonbuild/compilers/clike.py b/mesonbuild/compilers/clike.py -index 83f67591..f9cbeabd 100644 ---- a/mesonbuild/compilers/clike.py -+++ b/mesonbuild/compilers/clike.py -@@ -375,6 +375,7 @@ class CLikeCompiler: - #ifndef {symbol} - {symbol}; - #endif -+ return 0; - }}''' - return self.compiles(t.format(**fargs), env, extra_args=extra_args, - dependencies=dependencies) -@@ -554,6 +555,7 @@ class CLikeCompiler: - {prefix} - int main(int argc, char **argv) {{ - {type} something; -+ return 0; - }}''' - if not self.compiles(t.format(**fargs), env, extra_args=extra_args, - dependencies=dependencies)[0]: -@@ -589,6 +591,7 @@ class CLikeCompiler: - {prefix} - int main(int argc, char **argv) {{ - {type} something; -+ return 0; - }}''' - if not self.compiles(t.format(**fargs), env, extra_args=extra_args, - dependencies=dependencies)[0]: -@@ -667,6 +670,7 @@ class CLikeCompiler: - #include <stdio.h> - int main(int argc, char *argv[]) {{ - printf ("{fmt}", {cast} {f}()); -+ return 0; - }}'''.format(**fargs) - res = self.run(code, env, extra_args=extra_args, dependencies=dependencies) - if not res.compiled: -@@ -819,6 +823,7 @@ class CLikeCompiler: - #error "No definition for __builtin_{func} found in the prefix" - #endif - #endif -+ return 0; - }}''' - return self.links(t.format(**fargs), env, extra_args=extra_args, - dependencies=dependencies) --- -2.17.1 - diff --git a/poky/meta/recipes-devtools/meson/meson_0.51.1.bb b/poky/meta/recipes-devtools/meson/meson_0.51.2.bb index de9b905c1..de9b905c1 100644 --- a/poky/meta/recipes-devtools/meson/meson_0.51.1.bb +++ b/poky/meta/recipes-devtools/meson/meson_0.51.2.bb diff --git a/poky/meta/recipes-devtools/meson/nativesdk-meson_0.51.1.bb b/poky/meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb index 1756f342c..1756f342c 100644 --- a/poky/meta/recipes-devtools/meson/nativesdk-meson_0.51.1.bb +++ b/poky/meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb diff --git a/poky/meta/recipes-devtools/patch/patch/0001-Don-t-leak-temporary-file-on-failed-ed-style-patch.patch b/poky/meta/recipes-devtools/patch/patch/0001-Don-t-leak-temporary-file-on-failed-ed-style-patch.patch index 9891526e4..78345e925 100644 --- a/poky/meta/recipes-devtools/patch/patch/0001-Don-t-leak-temporary-file-on-failed-ed-style-patch.patch +++ b/poky/meta/recipes-devtools/patch/patch/0001-Don-t-leak-temporary-file-on-failed-ed-style-patch.patch @@ -17,6 +17,7 @@ https://savannah.gnu.org/bugs/index.php?53820 Fixes: 123eaff0d5d1 ("Fix arbitrary command execution in ed-style patches (CVE-2018-1000156)") +CVE: CVE-2018-1000156 Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/patch.git/commit/?id=19599883ffb6a450d2884f081f8ecf68edbed7ee] Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- diff --git a/poky/meta/recipes-devtools/patch/patch/0001-Don-t-leak-temporary-file-on-failed-multi-file-ed.patch b/poky/meta/recipes-devtools/patch/patch/0001-Don-t-leak-temporary-file-on-failed-multi-file-ed.patch index d6a219a1b..8ffffef47 100644 --- a/poky/meta/recipes-devtools/patch/patch/0001-Don-t-leak-temporary-file-on-failed-multi-file-ed.patch +++ b/poky/meta/recipes-devtools/patch/patch/0001-Don-t-leak-temporary-file-on-failed-multi-file-ed.patch @@ -17,6 +17,7 @@ https://savannah.gnu.org/bugs/index.php?53820 Fixes: 123eaff0d5d1 ("Fix arbitrary command execution in ed-style patches (CVE-2018-1000156)") Fixes: 19599883ffb6 ("Don't leak temporary file on failed ed-style patch") +CVE: CVE-2018-1000156 Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/patch.git/commit/?id=369dcccdfa6336e5a873d6d63705cfbe04c55727] Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- diff --git a/poky/meta/recipes-devtools/prelink/prelink_git.bb b/poky/meta/recipes-devtools/prelink/prelink_git.bb index b1261d594..f0946de2c 100644 --- a/poky/meta/recipes-devtools/prelink/prelink_git.bb +++ b/poky/meta/recipes-devtools/prelink/prelink_git.bb @@ -36,6 +36,9 @@ SRC_URI = "git://git.yoctoproject.org/prelink-cross.git;branch=cross_prelink_sta " UPSTREAM_CHECK_COMMITS = "1" +# error: error.h: No such file or directory +COMPATIBLE_HOST_libc-musl = 'null' + TARGET_OS_ORIG := "${TARGET_OS}" OVERRIDES_append = ":${TARGET_OS_ORIG}" diff --git a/poky/meta/recipes-devtools/pseudo/files/0001-maketables-wrappers-use-Python-3.patch b/poky/meta/recipes-devtools/pseudo/files/0001-maketables-wrappers-use-Python-3.patch new file mode 100644 index 000000000..b2dbdad27 --- /dev/null +++ b/poky/meta/recipes-devtools/pseudo/files/0001-maketables-wrappers-use-Python-3.patch @@ -0,0 +1,34 @@ +From dbd34b1b2af8fbf44a0d5c37abe3448405819823 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 28 Aug 2019 19:20:29 +0200 +Subject: [PATCH] maketables/wrappers: use Python 3 + +Changelog indicates they should be compatible. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + maketables | 2 +- + makewrappers | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/maketables b/maketables +index a211772..52285e2 100755 +--- a/maketables ++++ b/maketables +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # Copyright (c) 2008-2010, 2013 Wind River Systems, Inc. + # +diff --git a/makewrappers b/makewrappers +index e84607d..b34f7eb 100755 +--- a/makewrappers ++++ b/makewrappers +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # Copyright (c) 2008-2011,2013 Wind River Systems, Inc. + # diff --git a/poky/meta/recipes-devtools/pseudo/pseudo_git.bb b/poky/meta/recipes-devtools/pseudo/pseudo_git.bb index 6cf711e4c..78500e1cc 100644 --- a/poky/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/poky/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -6,9 +6,12 @@ SRC_URI = "git://git.yoctoproject.org/pseudo \ file://fallback-group \ file://moreretries.patch \ file://toomanyfiles.patch \ + file://0001-maketables-wrappers-use-Python-3.patch \ " SRCREV = "060058bb29f70b244e685b3c704eb0641b736f73" S = "${WORKDIR}/git" PV = "1.9.0+git${SRCPV}" +# error: use of undeclared identifier '_STAT_VER' +COMPATIBLE_HOST_libc-musl = 'null' diff --git a/poky/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch b/poky/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch index 8fe0d1a27..98a970583 100644 --- a/poky/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +++ b/poky/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch @@ -1,4 +1,4 @@ -From c14554c7e2fff8dd559dfb41e7dd11392c6f85e3 Mon Sep 17 00:00:00 2001 +From 672a75c8417ce08db9e31fc415ec445479231d5a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 10 Dec 2015 13:20:30 +0200 Subject: [PATCH] Don't search /usr and so on for libraries by default to @@ -10,14 +10,14 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- - numpy/distutils/system_info.py | 50 ++++------------------------------ - 1 file changed, 6 insertions(+), 44 deletions(-) + numpy/distutils/system_info.py | 42 ++++------------------------------ + 1 file changed, 5 insertions(+), 37 deletions(-) diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index 2424943..bf56a6d 100644 +index ba2b1f4..f94dce1 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py -@@ -274,51 +274,13 @@ if sys.platform == 'win32': +@@ -278,45 +278,13 @@ if sys.platform == 'win32': add_system_root(os.path.join(conda_dir, 'Library')) else: @@ -45,31 +45,24 @@ index 2424943..bf56a6d 100644 - default_x11_include_dirs.extend(['/usr/lib/X11/include', - '/usr/include/X11']) - -- import subprocess as sp -- tmp = None -- try: -- # Explicitly open/close file to avoid ResourceWarning when -- # tests are run in debug mode Python 3. -- tmp = open(os.devnull, 'w') -- p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.PIPE, -- stderr=tmp) -- except (OSError, DistutilsError): -- # OSError if gcc is not installed, or SandboxViolation (DistutilsError -- # subclass) if an old setuptools bug is triggered (see gh-3160). -- pass -- else: -- triplet = str(p.communicate()[0].decode().strip()) -- if p.returncode == 0: -- # gcc supports the "-print-multiarch" option -- default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)] -- default_lib_dirs += [os.path.join("/usr/lib/", triplet)] -- finally: -- if tmp is not None: -- tmp.close() +- with open(os.devnull, 'w') as tmp: +- try: +- p = subprocess.Popen(["gcc", "-print-multiarch"], stdout=subprocess.PIPE, +- stderr=tmp) +- except (OSError, DistutilsError): +- # OSError if gcc is not installed, or SandboxViolation (DistutilsError +- # subclass) if an old setuptools bug is triggered (see gh-3160). +- pass +- else: +- triplet = str(p.communicate()[0].decode().strip()) +- if p.returncode == 0: +- # gcc supports the "-print-multiarch" option +- default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)] +- default_lib_dirs += [os.path.join("/usr/lib/", triplet)] + default_lib_dirs = libpaths(['/deadir/lib'], platform_bits) + default_include_dirs = ['/deaddir/include'] + default_src_dirs = ['.', '/deaddir/src'] -+ + + default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits) + default_x11_include_dirs = ['/deaddir/include'] diff --git a/poky/meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch b/poky/meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch new file mode 100644 index 000000000..ebb2a6f9d --- /dev/null +++ b/poky/meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch @@ -0,0 +1,32 @@ +From b881e0b2ba9cf1a4aa351a1c1ea90b1e1776ce21 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 12 Aug 2019 15:37:36 +0200 +Subject: [PATCH] numpy/random/setup.py: remove the detection of x86 targets + via uname() + +This was badly breaking compilation for ARM targets (and possibly +other non-x86 targets); if -msse2 is desirable for x86 builds it has +to be passed through another channel. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + numpy/random/setup.py | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/numpy/random/setup.py b/numpy/random/setup.py +index a1bf3b8..60fb534 100644 +--- a/numpy/random/setup.py ++++ b/numpy/random/setup.py +@@ -49,11 +49,6 @@ def configuration(parent_package='', top_path=None): + elif not is_msvc: + # Some bit generators require c99 + EXTRA_COMPILE_ARGS += ['-std=c99'] +- INTEL_LIKE = any([val in k.lower() for k in platform.uname() +- for val in ('x86', 'i686', 'i386', 'amd64')]) +- if INTEL_LIKE: +- # Assumes GCC or GCC-like compiler +- EXTRA_COMPILE_ARGS += ['-msse2'] + + # Use legacy integer variable sizes + LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')] diff --git a/poky/meta/recipes-devtools/python-numpy/python-numpy.inc b/poky/meta/recipes-devtools/python-numpy/python-numpy.inc index 43c3053cd..a12e72f96 100644 --- a/poky/meta/recipes-devtools/python-numpy/python-numpy.inc +++ b/poky/meta/recipes-devtools/python-numpy/python-numpy.inc @@ -1,7 +1,7 @@ SUMMARY = "A sophisticated Numeric Processing Package for Python" SECTION = "devel/python" -LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231" +LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1" SRCNAME = "numpy" @@ -9,13 +9,17 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ file://0001-npy_cpu-Add-riscv-support.patch \ ${CONFIGFILESURI} \ + file://0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch \ " -SRC_URI[md5sum] = "0886e5b5017f08f2b7a624c0b5931e61" -SRC_URI[sha256sum] = "adf063a3f87ab89393f5eea0eb903293b112fa0a308e8c594a75ffa585d81d4f" +SRC_URI[md5sum] = "c48b2ad785f82cdfe28c907ce35e2a71" +SRC_URI[sha256sum] = "47b7b6145e7ba5918ce26be25999b6d4b35cf9fbfdf46b7da50090ffdb020445" UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" +# Needed for building with gcc 4.x from centos 7 +CFLAGS_append_class-native = " -std=c99" + CONFIGFILESURI ?= "" CONFIGFILESURI_aarch64 = " \ @@ -109,6 +113,7 @@ RDEPENDS_${PN} = "${PYTHON_PN}-unittest \ ${PYTHON_PN}-compression \ ${PYTHON_PN}-ctypes \ ${PYTHON_PN}-threading \ + ${PYTHON_PN}-multiprocessing \ " RDEPENDS_${PN}_class-native = "" diff --git a/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb b/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb index d388e88d2..d388e88d2 100644 --- a/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb +++ b/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb diff --git a/poky/meta/recipes-devtools/python/python-testtools.inc b/poky/meta/recipes-devtools/python/python-testtools.inc index 1011c98a3..d0b2e46d7 100644 --- a/poky/meta/recipes-devtools/python/python-testtools.inc +++ b/poky/meta/recipes-devtools/python/python-testtools.inc @@ -19,6 +19,7 @@ DEPENDS += " \ " RDEPENDS_${PN} += "\ + ${PYTHON_PN}-doctest \ ${PYTHON_PN}-extras \ ${PYTHON_PN}-pbr \ ${PYTHON_PN}-six \ diff --git a/poky/meta/recipes-devtools/python/python.inc b/poky/meta/recipes-devtools/python/python.inc index 70481002b..1462b779e 100644 --- a/poky/meta/recipes-devtools/python/python.inc +++ b/poky/meta/recipes-devtools/python/python.inc @@ -37,7 +37,6 @@ EXTRA_OECONF = "\ --enable-shared \ --enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)} \ ac_cv_header_bluetooth_bluetooth_h=no ac_cv_header_bluetooth_h=no \ - ${PYTHONLSBOPTS} \ " do_configure_prepend() { diff --git a/poky/meta/recipes-devtools/python/python3-dbus_1.2.8.bb b/poky/meta/recipes-devtools/python/python3-dbus_1.2.10.bb index 2fb1eae96..8892d0fb4 100644 --- a/poky/meta/recipes-devtools/python/python3-dbus_1.2.8.bb +++ b/poky/meta/recipes-devtools/python/python3-dbus_1.2.10.bb @@ -8,8 +8,8 @@ DEPENDS = "expat dbus glib-2.0 virtual/libintl" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \ " -SRC_URI[md5sum] = "7379db774c10904f27e7e2743d90fb43" -SRC_URI[sha256sum] = "abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f" +SRC_URI[md5sum] = "5d21d5ae6423f0e41caa3400af44edac" +SRC_URI[sha256sum] = "d4332bbd4a0054fa4010b259c293b84d461bbd9d7a8ef528157d151c0398d886" S = "${WORKDIR}/dbus-python-${PV}" inherit distutils3-base autotools pkgconfig diff --git a/poky/meta/recipes-devtools/python/python3-git_3.0.0.bb b/poky/meta/recipes-devtools/python/python3-git_3.0.2.bb index b6c837cdf..9dd753db4 100644 --- a/poky/meta/recipes-devtools/python/python3-git_3.0.0.bb +++ b/poky/meta/recipes-devtools/python/python3-git_3.0.2.bb @@ -12,8 +12,8 @@ PYPI_PACKAGE = "GitPython" inherit pypi setuptools3 -SRC_URI[md5sum] = "9412ae9665fd29328f2afc6df887ae81" -SRC_URI[sha256sum] = "629867ebf609cef21bb9d849039e281e25963fb7d714a2f6bacc1ecce4800293" +SRC_URI[md5sum] = "ccec14a5c9f18702406122983d80032c" +SRC_URI[sha256sum] = "d2f4945f8260f6981d724f5957bc076398ada55cb5d25aaee10108bcdc894100" DEPENDS += " ${PYTHON_PN}-gitdb" diff --git a/poky/meta/recipes-devtools/python/python3-pbr_5.4.2.bb b/poky/meta/recipes-devtools/python/python3-pbr_5.4.2.bb deleted file mode 100644 index d59e744e6..000000000 --- a/poky/meta/recipes-devtools/python/python3-pbr_5.4.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -inherit setuptools3 -require python-pbr.inc - -SRC_URI[md5sum] = "ea90e1118a0132da752d45e68d10b2b8" -SRC_URI[sha256sum] = "9b321c204a88d8ab5082699469f52cc94c5da45c51f114113d01b3d993c24cdf" diff --git a/poky/meta/recipes-devtools/python/python3-pbr_5.4.3.bb b/poky/meta/recipes-devtools/python/python3-pbr_5.4.3.bb new file mode 100644 index 000000000..e7835e7a9 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-pbr_5.4.3.bb @@ -0,0 +1,5 @@ +inherit setuptools3 +require python-pbr.inc + +SRC_URI[md5sum] = "477d2aa285ad97250a172b199f4060b7" +SRC_URI[sha256sum] = "2c8e420cd4ed4cec4e7999ee47409e876af575d4c35a45840d59e8b5f3155ab8" diff --git a/poky/meta/recipes-devtools/python/python3-pip_19.2.2.bb b/poky/meta/recipes-devtools/python/python3-pip_19.2.3.bb index faafbc157..aa7253d3f 100644 --- a/poky/meta/recipes-devtools/python/python3-pip_19.2.2.bb +++ b/poky/meta/recipes-devtools/python/python3-pip_19.2.3.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" DEPENDS += "python3 python3-setuptools-native" -SRC_URI[md5sum] = "2ba0a3b76d39ccd90ca22bfa82fc635f" -SRC_URI[sha256sum] = "e05103825871e210d50a44c7e448587b0ed99dd775d3ef586304c58f40224a53" +SRC_URI[md5sum] = "f417444c66a0db1a82c8d9d2283a2f95" +SRC_URI[sha256sum] = "e7a31f147974362e6c82d84b91c7f2bdf57e4d3163d3d454e6c3e71944d67135" inherit pypi distutils3 diff --git a/poky/meta/recipes-devtools/python/python3/python3-manifest.json b/poky/meta/recipes-devtools/python/python3/python3-manifest.json index ec28c2dbb..8e94305af 100644 --- a/poky/meta/recipes-devtools/python/python3/python3-manifest.json +++ b/poky/meta/recipes-devtools/python/python3/python3-manifest.json @@ -115,7 +115,7 @@ "cached": [] }, "asyncio": { - "summary": "Python Asynchronous I/", + "summary": "Python Asynchronous I/O", "rdepends": [ "core", "io", diff --git a/poky/meta/recipes-devtools/python/python3_3.7.4.bb b/poky/meta/recipes-devtools/python/python3_3.7.4.bb index 80c9b2919..14119c33f 100644 --- a/poky/meta/recipes-devtools/python/python3_3.7.4.bb +++ b/poky/meta/recipes-devtools/python/python3_3.7.4.bb @@ -310,7 +310,7 @@ INSANE_SKIP_${PN}-dev += "dev-elf" # catch all the rest (unsorted) PACKAGES += "${PN}-misc" -RDEPENDS_${PN}-misc += "python3-core python3-email python3-codecs" +RDEPENDS_${PN}-misc += "python3-core python3-email python3-codecs python3-pydoc python3-pickle" RDEPENDS_${PN}-modules_append_class-target = " python3-misc" RDEPENDS_${PN}-modules_append_class-nativesdk = " python3-misc" FILES_${PN}-misc = "${libdir}/python${PYTHON_MAJMIN} ${libdir}/python${PYTHON_MAJMIN}/lib-dynload" diff --git a/poky/meta/recipes-devtools/qemu/qemu.inc b/poky/meta/recipes-devtools/qemu/qemu.inc index d2dd2bc9c..241f9dbec 100644 --- a/poky/meta/recipes-devtools/qemu/qemu.inc +++ b/poky/meta/recipes-devtools/qemu/qemu.inc @@ -22,6 +22,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0007-apic-fixup-fallthrough-to-PIC.patch \ file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0009-Fix-webkitgtk-builds.patch \ + file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" @@ -131,7 +132,7 @@ PACKAGECONFIG[xen] = "--enable-xen,--disable-xen,xen,xen-libxenstore xen-libxenc PACKAGECONFIG[vnc-sasl] = "--enable-vnc --enable-vnc-sasl,--disable-vnc-sasl,cyrus-sasl," PACKAGECONFIG[vnc-jpeg] = "--enable-vnc --enable-vnc-jpeg,--disable-vnc-jpeg,jpeg," PACKAGECONFIG[vnc-png] = "--enable-vnc --enable-vnc-png,--disable-vnc-png,libpng," -PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,libcurl," +PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,curl," PACKAGECONFIG[nss] = "--enable-smartcard,--disable-smartcard,nss," PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses," PACKAGECONFIG[gtk+] = "--enable-gtk,--disable-gtk,gtk+3 gettext-native" diff --git a/poky/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch b/poky/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch new file mode 100644 index 000000000..a8ab7daa4 --- /dev/null +++ b/poky/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch @@ -0,0 +1,93 @@ +From 5214dd4461f2090ef0965b4d2518f49927d61cbc Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Wed, 28 Aug 2019 19:56:28 +0800 +Subject: [Qemu-devel] [PATCH] configure: Add pkg-config handling for libgcrypt + +libgcrypt may also be controlled by pkg-config, this patch adds pkg-config +handling for libgcrypt. + +Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html] + +Signed-off-by: He Zhe <zhe.he@windriver.com> +--- + configure | 48 ++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 40 insertions(+), 8 deletions(-) + +diff --git a/configure b/configure +index e44e454..0f362a7 100755 +--- a/configure ++++ b/configure +@@ -2875,6 +2875,30 @@ has_libgcrypt() { + return 0 + } + ++has_libgcrypt_pkgconfig() { ++ if ! has $pkg_config ; then ++ return 1 ++ fi ++ ++ if ! $pkg_config --list-all | grep libgcrypt > /dev/null 2>&1 ; then ++ return 1 ++ fi ++ ++ if test -n "$cross_prefix" ; then ++ host=$($pkg_config --variable=host libgcrypt) ++ if test "${host%-gnu}-" != "${cross_prefix%-gnu}" ; then ++ print_error "host($host) does not match cross_prefix($cross_prefix)" ++ return 1 ++ fi ++ fi ++ ++ if ! $pkg_config --atleast-version=1.5.0 libgcrypt ; then ++ print_error "libgcrypt version is $($pkg_config --modversion libgcrypt)" ++ return 1 ++ fi ++ ++ return 0 ++} + + if test "$nettle" != "no"; then + pass="no" +@@ -2902,7 +2926,14 @@ fi + + if test "$gcrypt" != "no"; then + pass="no" +- if has_libgcrypt; then ++ if has_libgcrypt_pkgconfig; then ++ gcrypt_cflags=$($pkg_config --cflags libgcrypt) ++ if test "$static" = "yes" ; then ++ gcrypt_libs=$($pkg_config --libs --static libgcrypt) ++ else ++ gcrypt_libs=$($pkg_config --libs libgcrypt) ++ fi ++ elif has_libgcrypt; then + gcrypt_cflags=$(libgcrypt-config --cflags) + gcrypt_libs=$(libgcrypt-config --libs) + # Debian has removed -lgpg-error from libgcrypt-config +@@ -2912,15 +2943,16 @@ if test "$gcrypt" != "no"; then + then + gcrypt_libs="$gcrypt_libs -lgpg-error" + fi ++ fi + +- # Link test to make sure the given libraries work (e.g for static). +- write_c_skeleton +- if compile_prog "" "$gcrypt_libs" ; then +- LIBS="$gcrypt_libs $LIBS" +- QEMU_CFLAGS="$QEMU_CFLAGS $gcrypt_cflags" +- pass="yes" +- fi ++ # Link test to make sure the given libraries work (e.g for static). ++ write_c_skeleton ++ if compile_prog "" "$gcrypt_libs" ; then ++ LIBS="$gcrypt_libs $LIBS" ++ QEMU_CFLAGS="$QEMU_CFLAGS $gcrypt_cflags" ++ pass="yes" + fi ++ + if test "$pass" = "yes"; then + gcrypt="yes" + cat > $TMPC << EOF +-- +2.7.4 + diff --git a/poky/meta/recipes-devtools/qemu/qemu_4.1.0.bb b/poky/meta/recipes-devtools/qemu/qemu_4.1.0.bb index 76776098d..f0c1daabe 100644 --- a/poky/meta/recipes-devtools/qemu/qemu_4.1.0.bb +++ b/poky/meta/recipes-devtools/qemu/qemu_4.1.0.bb @@ -2,6 +2,10 @@ BBCLASSEXTEND = "nativesdk" require qemu.inc +# error: a parameter list without types is only allowed in a function definition +# void (*_function)(sigval_t); +COMPATIBLE_HOST_libc-musl = 'null' + DEPENDS = "glib-2.0 zlib pixman bison-native" RDEPENDS_${PN}_class-target += "bash" diff --git a/poky/meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch b/poky/meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch new file mode 100644 index 000000000..24aa4c7ff --- /dev/null +++ b/poky/meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch @@ -0,0 +1,58 @@ +From 43fbc3f53302a395463e8450ac81c53f623eec3f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 27 Aug 2019 17:42:34 +0200 +Subject: [PATCH] mono-find-provides/requires: do not use monodis from the host + +There was a host contamination issue here: if monodis was installed +on the host, do_package would use that to resolve dependencies +of mono libraries (and often fail in that). Without monodis, +no dependencies are resolved, which is seemingly how things +are supposed to work. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + scripts/mono-find-provides | 8 ++++---- + scripts/mono-find-requires | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/scripts/mono-find-provides b/scripts/mono-find-provides +index 9348457d3..b28872ffb 100644 +--- a/scripts/mono-find-provides ++++ b/scripts/mono-find-provides +@@ -18,11 +18,11 @@ monolist=($(printf "%s\n" "${filelist[@]}" | grep -E "\\.(exe|dll)\$")) + build_bindir="$2/usr/bin" + build_libdir="$2$3" + +-if [ -x $build_bindir/monodis ]; then +- monodis="$build_bindir/monodis" ++if [ -x $build_bindir/monodis.bogus ]; then ++ monodis="$build_bindir/monodis.bogus" + export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} +-elif [ -x /usr/bin/monodis ]; then +- monodis="/usr/bin/monodis" ++elif [ -x /usr/bin/monodis.bogus ]; then ++ monodis="/usr/bin/monodis.bogus" + else + exit 0; + fi +diff --git a/scripts/mono-find-requires b/scripts/mono-find-requires +index ea58cae48..d270169e1 100644 +--- a/scripts/mono-find-requires ++++ b/scripts/mono-find-requires +@@ -18,11 +18,11 @@ monolist=($(printf "%s\n" "${filelist[@]}" | grep -E "\\.(exe|dll)\$")) + build_bindir="$2/usr/bin" + build_libdir="$2$3" + +-if [ -x $build_bindir/monodis ]; then +- monodis="$build_bindir/monodis" ++if [ -x $build_bindir/monodis.bogus ]; then ++ monodis="$build_bindir/monodis.bogus" + export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} +-elif [ -x /usr/bin/monodis ]; then +- monodis="/usr/bin/monodis" ++elif [ -x /usr/bin/monodis.bogus ]; then ++ monodis="/usr/bin/monodis.bogus" + else + exit 0; + fi diff --git a/poky/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb b/poky/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb index 063f4269a..c37330eb4 100644 --- a/poky/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb +++ b/poky/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb @@ -41,6 +41,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \ file://0001-perl-disable-auto-reqs.patch \ file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \ file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ + file://0001-mono-find-provides-requires-do-not-use-monodis-from-.patch \ " PE = "1" diff --git a/poky/meta/recipes-devtools/subversion/subversion/subversion-1.12.0-apr_1.7.0_fix-1.patch b/poky/meta/recipes-devtools/subversion/subversion/subversion-1.12.0-apr_1.7.0_fix-1.patch deleted file mode 100644 index f0edd5fe8..000000000 --- a/poky/meta/recipes-devtools/subversion/subversion/subversion-1.12.0-apr_1.7.0_fix-1.patch +++ /dev/null @@ -1,107 +0,0 @@ -From b147803553237654f8268e831dee8fed4989ad3b Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Sat, 11 May 2019 14:46:39 +0800 -Subject: [PATCH] Submitted By: Pierre Labastie (pierre dot labastie at neuf - dot fr) Date: 2019-04-17 Initial Package Version: 1.11.1 Origin: Upstream - revision 1857391 Upstream Status: Committed Description: Get rid of - apr_int64_t format string check in swig py configure. - -This check relied on APR implementation details and broke with APR 1.7.0. -Rather than trying to guess a perfect format string to use, just use the -largest possible format and cast the argument accordingly. - -Should fix build against APR 1.7.0 and later. - -Suggested by: brane - -* build/ac-macros/swig.m4: Remove code related to SVN_APR_INT64_T_PYCFMT. - -* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c - (svn_swig_py_client_blame_receiver_func): Stop relying on the - SVN_APR_INT64_T_PYCFMT constant from configure. Use "L" and - acast to PY_LONG_LONG instead. - -Upstream-Status: Backport [www.linuxfromscratch.org/patches/blfs/svn/subversion-1.12.0-apr_1.7.0_fix-1.patch] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - build/ac-macros/swig.m4 | 35 ---------------------- - .../swig/python/libsvn_swig_py/swigutil_py.c | 9 +++--- - 2 files changed, 4 insertions(+), 40 deletions(-) - -diff --git a/build/ac-macros/swig.m4 b/build/ac-macros/swig.m4 -index 55501fb..2963872 100644 ---- a/build/ac-macros/swig.m4 -+++ b/build/ac-macros/swig.m4 -@@ -128,41 +128,6 @@ AC_DEFUN(SVN_FIND_SWIG, - ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`" - ]) - SWIG_PY_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_python_libs)`" -- -- dnl Sun Forte adds an extra space before substituting APR_INT64_T_FMT -- dnl gcc-2.95 adds an extra space after substituting APR_INT64_T_FMT -- dnl thus the egrep patterns have a + in them. -- SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES" -- AC_CACHE_CHECK([for apr_int64_t Python/C API format string], -- [svn_cv_pycfmt_apr_int64_t], [ -- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd], -- [#include <apr.h> -- MaTcHtHiS APR_INT64_T_FMT EnDeNd], -- [svn_cv_pycfmt_apr_int64_t="L"]) -- fi -- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r -- [#include <apr.h> -- MaTcHtHiS APR_INT64_T_FMT EnDeNd], -- [svn_cv_pycfmt_apr_int64_t="l"]) -- fi -- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_EGREP_CPP([MaTcHtHiS +\"d\" +EnDeNd], -- [#include <apr.h> -- MaTcHtHiS APR_INT64_T_FMT EnDeNd], -- [svn_cv_pycfmt_apr_int64_t="i"]) -- fi -- ]) -- CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS" -- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_MSG_ERROR([failed to recognize APR_INT64_T_FMT on this platform]) -- fi -- AC_DEFINE_UNQUOTED([SVN_APR_INT64_T_PYCFMT], -- ["$svn_cv_pycfmt_apr_int64_t"], -- [Define to the Python/C API format character suitable] -- [ for apr_int64_t]) - fi - - if test "$PERL" != "none"; then -diff --git a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c -index 2c90a6a..abe5a2a 100644 ---- a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c -+++ b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c -@@ -46,7 +46,7 @@ - #include "svn_mergeinfo.h" - #include "svn_types.h" - --#include "svn_private_config.h" /* for SVN_APR_INT64_T_PYCFMT */ -+#include "svn_private_config.h" - - #include "swig_python_external_runtime.swg" - #include "swigutil_py.h" -@@ -3394,10 +3394,9 @@ svn_error_t *svn_swig_py_client_blame_receiver_func(void *baton, - svn_swig_py_acquire_py_lock(); - - if ((result = PyObject_CallFunction(receiver, -- (char *) -- (SVN_APR_INT64_T_PYCFMT "lsssO&"), -- line_no, revision, author, date, line, -- make_ob_pool, pool)) == NULL) -+ (char *)"LlsssO&", -+ (PY_LONG_LONG)line_no, revision, author, -+ date, line, make_ob_pool, pool)) == NULL) - { - err = callback_exception_error(); - } --- -2.7.4 - diff --git a/poky/meta/recipes-devtools/subversion/subversion_1.12.0.bb b/poky/meta/recipes-devtools/subversion/subversion_1.12.2.bb index f1ac1dcfd..4ffa1c584 100644 --- a/poky/meta/recipes-devtools/subversion/subversion_1.12.0.bb +++ b/poky/meta/recipes-devtools/subversion/subversion_1.12.2.bb @@ -11,11 +11,10 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://disable_macos.patch \ file://0001-Fix-libtool-name-in-configure.ac.patch \ file://serfmacro.patch \ - file://subversion-1.12.0-apr_1.7.0_fix-1.patch \ " -SRC_URI[md5sum] = "be4f5c0b1b38a5d82bd6d16a16ff1346" -SRC_URI[sha256sum] = "7fae7c73d8a007c107c0ae5eb372bc0bb013dbfe966fcd5c59cd5a195a5e2edf" +SRC_URI[md5sum] = "1ff249f848f834ded88536543e031975" +SRC_URI[sha256sum] = "3bd0b5c8e4c5175263dc9a92fd9aef94ce917e80af034f26fe5c45fde7e0f771" inherit autotools pkgconfig gettext diff --git a/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb b/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb index 1ae21b1fb..b0433e0e9 100644 --- a/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb +++ b/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb @@ -33,5 +33,5 @@ do_configure_prepend() { FILES_${PN} += "${systemd_unitdir}/systemd-bootchart" -EXTRA_OECONF = " --with-rootprefix=${base_prefix} \ +EXTRA_OECONF = " --with-rootprefix=${root_prefix} \ --with-rootlibdir=${base_libdir}" diff --git a/poky/meta/recipes-extended/cups/cups.inc b/poky/meta/recipes-extended/cups/cups.inc index 46fb2dded..e303f3424 100644 --- a/poky/meta/recipes-extended/cups/cups.inc +++ b/poky/meta/recipes-extended/cups/cups.inc @@ -67,7 +67,7 @@ do_install () { # Remove /var/run from package as cupsd will populate it on startup rm -fr ${D}/${localstatedir}/run - rmdir ${D}/${libdir}/${BPN}/driver + rmdir ${D}/${libexecdir}/${BPN}/driver # Fix the pam configuration file permissions if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then diff --git a/poky/meta/recipes-extended/cups/cups/cups_serverbin.patch b/poky/meta/recipes-extended/cups/cups/cups_serverbin.patch index f7b44a7bc..85c6af107 100644 --- a/poky/meta/recipes-extended/cups/cups/cups_serverbin.patch +++ b/poky/meta/recipes-extended/cups/cups/cups_serverbin.patch @@ -4,6 +4,12 @@ e.g. ppc64 where base libdir is lib64 this does not go well Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Inappropriate [OE config specific] +Update on 20190904: +Redefine CUPS_SERVERBIN to "$libexecdir/cups" which solves file confliction +when multilib is enabled. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + Index: cups-1.4.6/config-scripts/cups-directories.m4 =================================================================== --- cups-1.4.6.orig/config-scripts/cups-directories.m4 2009-04-12 16:04:51.000000000 -0700 @@ -13,7 +19,7 @@ Index: cups-1.4.6/config-scripts/cups-directories.m4 # All others INSTALL_SYSV="install-sysv" - CUPS_SERVERBIN="$exec_prefix/lib/cups" -+ CUPS_SERVERBIN="$libdir/cups" ++ CUPS_SERVERBIN="$libexecdir/cups" ;; esac @@ -26,7 +32,7 @@ Index: cups-1.4.6/configure # All others INSTALL_SYSV="install-sysv" - CUPS_SERVERBIN="$exec_prefix/lib/cups" -+ CUPS_SERVERBIN="$libdir/cups" ++ CUPS_SERVERBIN="$libexecdir/cups" ;; esac diff --git a/poky/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch b/poky/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch new file mode 100644 index 000000000..aac1c4346 --- /dev/null +++ b/poky/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch @@ -0,0 +1,35 @@ +From bd7fb8be2ae2d75347cf7733302d5093046ffa85 Mon Sep 17 00:00:00 2001 +From: Peiran Hong <peiran.hong@windriver.com> +Date: Thu, 5 Sep 2019 15:42:22 -0400 +Subject: [PATCH] Skip strip-trailing-cr test case + +Skip the test "strip-trailing-cr" since it requires valgrind to +work, but valgrind is considered too heavy-weight for diffutils +package. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Peiran Hong <peiran.hong@windriver.com> +--- + tests/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 83a7c9d..04d51b5 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -21,8 +21,10 @@ TESTS = \ + stdin \ + strcoll-0-names \ + filename-quoting \ +- strip-trailing-cr \ + colors ++# Skipping this test since it requires valgrind ++# and thus is too heavy for diffutils package ++# strip-trailing-cr + + XFAIL_TESTS = large-subopt + +-- +2.21.0 + diff --git a/poky/meta/recipes-extended/diffutils/diffutils_3.7.bb b/poky/meta/recipes-extended/diffutils/diffutils_3.7.bb index 7daeee351..8111ae606 100644 --- a/poky/meta/recipes-extended/diffutils/diffutils_3.7.bb +++ b/poky/meta/recipes-extended/diffutils/diffutils_3.7.bb @@ -5,6 +5,7 @@ require diffutils.inc SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ file://run-ptest \ + file://0001-Skip-strip-trailing-cr-test-case.patch \ " SRC_URI[md5sum] = "4824adc0e95dbbf11dfbdfaad6a1e461" @@ -17,7 +18,7 @@ acpaths = "-I ./m4" inherit ptest -RDEPENDS_${PN}-ptest += "make" +RDEPENDS_${PN}-ptest += "make perl" do_install_ptest() { t=${D}${PTEST_PATH} diff --git a/poky/meta/recipes-extended/gzip/gzip_1.10.bb b/poky/meta/recipes-extended/gzip/gzip_1.10.bb index 5ab99d0b1..50dad7bf5 100644 --- a/poky/meta/recipes-extended/gzip/gzip_1.10.bb +++ b/poky/meta/recipes-extended/gzip/gzip_1.10.bb @@ -14,7 +14,7 @@ PROVIDES_append_class-native = " gzip-replacement-native" RDEPENDS_${PN}-ptest += "make perl perl-ptest grep diffutils" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" inherit ptest diff --git a/poky/meta/recipes-extended/images/core-image-lsb-dev.bb b/poky/meta/recipes-extended/images/core-image-lsb-dev.bb deleted file mode 100644 index d2dc9e2b5..000000000 --- a/poky/meta/recipes-extended/images/core-image-lsb-dev.bb +++ /dev/null @@ -1,7 +0,0 @@ -require core-image-lsb.bb - -DESCRIPTION = "Basic image without X support suitable for development work. It \ -can be used for customization and implementations that conform to Linux \ -Standard Base (LSB)." - -IMAGE_FEATURES += "dev-pkgs" diff --git a/poky/meta/recipes-extended/images/core-image-lsb-sdk.bb b/poky/meta/recipes-extended/images/core-image-lsb-sdk.bb deleted file mode 100644 index a3d602edd..000000000 --- a/poky/meta/recipes-extended/images/core-image-lsb-sdk.bb +++ /dev/null @@ -1,12 +0,0 @@ -require core-image-lsb.bb - -DESCRIPTION = "Basic image without X support suitable for Linux Standard Base \ -(LSB) implementations. It includes the full meta-toolchain, plus development \ -headers and libraries to form a standalone SDK." - -IMAGE_FEATURES += "tools-sdk dev-pkgs tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks" - -IMAGE_INSTALL += "kernel-devsrc" - -# Reduce this to try and keep below the 4GB image size for now -IMAGE_OVERHEAD_FACTOR = "1.2" diff --git a/poky/meta/recipes-extended/images/core-image-lsb.bb b/poky/meta/recipes-extended/images/core-image-lsb.bb deleted file mode 100644 index ab61c6e6d..000000000 --- a/poky/meta/recipes-extended/images/core-image-lsb.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "An image containing packages that are required to conform \ -to the Linux Standard Base (LSB) specification." - -IMAGE_FEATURES += "splash ssh-server-openssh hwcodecs package-management" - -IMAGE_INSTALL = "\ - ${CORE_IMAGE_BASE_INSTALL} \ - packagegroup-core-full-cmdline \ - packagegroup-core-lsb \ - " - -inherit core-image distro_features_check - -REQUIRED_DISTRO_FEATURES = "pam" diff --git a/poky/meta/recipes-extended/iputils/iputils/ai_canonidn.patch b/poky/meta/recipes-extended/iputils/iputils/ai_canonidn.patch deleted file mode 100644 index cd91267b7..000000000 --- a/poky/meta/recipes-extended/iputils/iputils/ai_canonidn.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 714e2b458c151c5bdfe93647445cd00dd8e36fff Mon Sep 17 00:00:00 2001 -From: Petr Vorel <petr.vorel@gmail.com> -Date: Sat, 21 Jul 2018 17:46:14 +0200 -Subject: [PATCH] ping: Fix AI_CANONIDN usage on some systems - -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -Commit 99f67db used AI_CANONIDN in a way, which broke compilation on -systems where AI_CANONIDN is not defined in netdb.h (e.g. glibc < 2.3.4, -alternative libcs that don't support IDN: e.g. current musl 1.1.19 and -uClibc-ng 1.0.30) when not using the system libidn2. - -Fixes: 99f67db ping: Fix ping name encoded using ACE on C locale - -Reported-by: Nicholas Fish -Signed-off-by: Petr Vorel <petr.vorel@gmail.com> - ---- - ping.c | 2 +- - ping.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ping.c b/ping.c -index 733477f..b241815 100644 ---- a/ping.c -+++ b/ping.c -@@ -207,9 +207,9 @@ main(int argc, char **argv) - - #ifdef USE_IDN - setlocale(LC_ALL, ""); --#endif - if (!strcmp(setlocale(LC_ALL, NULL), "C")) - hints.ai_flags &= ~ AI_CANONIDN; -+#endif - - /* Support being called using `ping4` or `ping6` symlinks */ - if (argv[0][strlen(argv[0])-1] == '4') -diff --git a/ping.h b/ping.h -index 3e09685..8a0c4ef 100644 ---- a/ping.h -+++ b/ping.h -@@ -28,7 +28,6 @@ - #include <netinet/icmp6.h> - #include <linux/filter.h> - #include <resolv.h> --#include <locale.h> - - #ifdef CAPABILITIES - #include <sys/prctl.h> -@@ -36,6 +35,7 @@ - #endif - - #ifdef USE_IDN -+#include <locale.h> - #include <idn2.h> - #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN) - #define getnameinfo_flags NI_IDN diff --git a/poky/meta/recipes-extended/iputils/iputils/install.patch b/poky/meta/recipes-extended/iputils/iputils/install.patch deleted file mode 100644 index abfefd7a5..000000000 --- a/poky/meta/recipes-extended/iputils/iputils/install.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5c8c3b04d73304679340f893636e87691992053b Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross@burtonini.com> -Date: Mon, 23 Jul 2018 14:21:03 +0100 -Subject: [PATCH] Add install - -Add a simple install rule so that we always install the binaries that were built. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton <ross.burton@intel.com> - ---- - Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Makefile b/Makefile -index 17fc5c9..e0c2784 100644 ---- a/Makefile -+++ b/Makefile -@@ -231,3 +231,7 @@ rpm: - @$(RPMBUILD) -ta --define 'current yes' $(RPMTMP)/iputils.tar.bz2 - @rm -f $(RPMTMP)/iputils.tar.bz2 - -+install: -+ for t in $(TARGETS); do \ -+ install -D $$t $(DESTDIR)$(bindir)/$$t; \ -+ done diff --git a/poky/meta/recipes-extended/iputils/iputils_s20180629.bb b/poky/meta/recipes-extended/iputils/iputils_s20180629.bb deleted file mode 100644 index eff44be1b..000000000 --- a/poky/meta/recipes-extended/iputils/iputils_s20180629.bb +++ /dev/null @@ -1,61 +0,0 @@ -SUMMARY = "Network monitoring tools" -DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \ -tracepath, tracepath6, ping, ping6 and arping." -HOMEPAGE = "https://github.com/iputils/iputils" -SECTION = "console/network" - -LICENSE = "BSD & GPLv2+" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=b792e38abdc59f766a3153908f23e766 \ - file://LICENSE.BSD3;md5=0f00d99239d922ffd13cabef83b33444 \ - file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "gnutls libcap libgcrypt" - -SRC_URI = "git://github.com/iputils/iputils \ - file://ai_canonidn.patch \ - file://install.patch" -SRCREV = "f6aac8dbe3f8c45c53424854a3312bdd8cdd58d3" - -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>s\d+)" - -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[libidn] = "USE_IDN=yes,USE_IDN=no,libidn2" - -do_compile () { - oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}:${STAGING_DIR_HOST}/${base_libdir}" ${PACKAGECONFIG_CONFARGS} all -} - -do_install() { - oe_runmake DESTDIR=${D} bindir=${base_bindir} install - for b in ping traceroute6 clockdiff; do - chmod u+s ${D}${base_bindir}/$b - done -} - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "100" - -ALTERNATIVE_${PN}-ping = "ping" -ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" - -SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff ${PN}-tftpd ${PN}-rarpd ${PN}-rdisc" -PACKAGES += "${SPLITPKGS}" - -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} += "${SPLITPKGS}" - -FILES_${PN} = "" -FILES_${PN}-ping = "${base_bindir}/ping.${BPN}" -FILES_${PN}-arping = "${base_bindir}/arping" -FILES_${PN}-tracepath = "${base_bindir}/tracepath" -FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" -FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" -FILES_${PN}-tftpd = "${base_bindir}/tftpd" -FILES_${PN}-rarpd = "${base_bindir}/rarpd" -FILES_${PN}-rdisc = "${base_bindir}/rdisc" diff --git a/poky/meta/recipes-extended/iputils/iputils_s20190709.bb b/poky/meta/recipes-extended/iputils/iputils_s20190709.bb new file mode 100644 index 000000000..d8f2470d0 --- /dev/null +++ b/poky/meta/recipes-extended/iputils/iputils_s20190709.bb @@ -0,0 +1,55 @@ +SUMMARY = "Network monitoring tools" +DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \ +tracepath, tracepath6, ping, ping6 and arping." +HOMEPAGE = "https://github.com/iputils/iputils" +SECTION = "console/network" + +LICENSE = "BSD & GPLv2+" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=55aa8c9fcad0691cef0ecd420361e390" + +DEPENDS = "gnutls" + +SRC_URI = "git://github.com/iputils/iputils" +SRCREV = "13e00847176aa23683d68fce1d17ffb523510946" + +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>s\d+)" + +PACKAGECONFIG ??= "libcap libgcrypt rarpd traceroute6" +PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap" +PACKAGECONFIG[libgcrypt] = "-DUSE_CRYPTO=gcrypt, -DUSE_CRYPTO=none, libgcrypt" +PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2" +PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" +PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false," +PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false," +PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" + +inherit meson update-alternatives + +EXTRA_OEMESON += "--prefix=${root_prefix}/" + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE_${PN}-ping = "ping" +ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" + +SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff ${PN}-tftpd ${PN}-rarpd ${PN}-rdisc ${PN}-ninfod" +PACKAGES += "${SPLITPKGS}" + +ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY_${PN}-rarpd = "1" +ALLOW_EMPTY_${PN}-traceroute6 = "1" +RDEPENDS_${PN} += "${SPLITPKGS}" + +FILES_${PN} = "" +FILES_${PN}-ping = "${base_bindir}/ping.${BPN}" +FILES_${PN}-arping = "${base_bindir}/arping" +FILES_${PN}-tracepath = "${base_bindir}/tracepath" +FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" +FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" +FILES_${PN}-tftpd = "${base_bindir}/tftpd" +FILES_${PN}-rarpd = "${base_sbindir}/rarpd" +FILES_${PN}-rdisc = "${base_sbindir}/rdisc" +FILES_${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh" diff --git a/poky/meta/recipes-extended/libarchive/libarchive/CVE-2018-1000877.patch b/poky/meta/recipes-extended/libarchive/libarchive/CVE-2018-1000877.patch deleted file mode 100644 index ce638370b..000000000 --- a/poky/meta/recipes-extended/libarchive/libarchive/CVE-2018-1000877.patch +++ /dev/null @@ -1,38 +0,0 @@ -CVE: CVE-2018-1000877 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 021efa522ad729ff0f5806c4ce53e4a6cc1daa31 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens <dja@axtens.net> -Date: Tue, 20 Nov 2018 17:56:29 +1100 -Subject: [PATCH] Avoid a double-free when a window size of 0 is specified - -new_size can be 0 with a malicious or corrupted RAR archive. - -realloc(area, 0) is equivalent to free(area), so the region would -be free()d here and the free()d again in the cleanup function. - -Found with a setup running AFL, afl-rb, and qsym. ---- - libarchive/archive_read_support_format_rar.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c -index 23452222..6f419c27 100644 ---- a/libarchive/archive_read_support_format_rar.c -+++ b/libarchive/archive_read_support_format_rar.c -@@ -2300,6 +2300,11 @@ parse_codes(struct archive_read *a) - new_size = DICTIONARY_MAX_SIZE; - else - new_size = rar_fls((unsigned int)rar->unp_size) << 1; -+ if (new_size == 0) { -+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, -+ "Zero window size is invalid."); -+ return (ARCHIVE_FATAL); -+ } - new_window = realloc(rar->lzss.window, new_size); - if (new_window == NULL) { - archive_set_error(&a->archive, ENOMEM, --- -2.20.0 - diff --git a/poky/meta/recipes-extended/libarchive/libarchive/CVE-2018-1000878.patch b/poky/meta/recipes-extended/libarchive/libarchive/CVE-2018-1000878.patch deleted file mode 100644 index 7468fd3c9..000000000 --- a/poky/meta/recipes-extended/libarchive/libarchive/CVE-2018-1000878.patch +++ /dev/null @@ -1,79 +0,0 @@ -CVE: CVE-2018-1000878 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From bfcfe6f04ed20db2504db8a254d1f40a1d84eb28 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens <dja@axtens.net> -Date: Tue, 4 Dec 2018 00:55:22 +1100 -Subject: [PATCH] rar: file split across multi-part archives must match - -Fuzzing uncovered some UAF and memory overrun bugs where a file in a -single file archive reported that it was split across multiple -volumes. This was caused by ppmd7 operations calling -rar_br_fillup. This would invoke rar_read_ahead, which would in some -situations invoke archive_read_format_rar_read_header. That would -check the new file name against the old file name, and if they didn't -match up it would free the ppmd7 buffer and allocate a new -one. However, because the ppmd7 decoder wasn't actually done with the -buffer, it would continue to used the freed buffer. Both reads and -writes to the freed region can be observed. - -This is quite tricky to solve: once the buffer has been freed it is -too late, as the ppmd7 decoder functions almost universally assume -success - there's no way for ppmd_read to signal error, nor are there -good ways for functions like Range_Normalise to propagate them. So we -can't detect after the fact that we're in an invalid state - e.g. by -checking rar->cursor, we have to prevent ourselves from ever ending up -there. So, when we are in the dangerous part or rar_read_ahead that -assumes a valid split, we set a flag force read_header to either go -down the path for split files or bail. This means that the ppmd7 -decoder keeps a valid buffer and just runs out of data. - -Found with a combination of AFL, afl-rb and qsym. ---- - libarchive/archive_read_support_format_rar.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c -index 6f419c27..a8cc5c94 100644 ---- a/libarchive/archive_read_support_format_rar.c -+++ b/libarchive/archive_read_support_format_rar.c -@@ -258,6 +258,7 @@ struct rar - struct data_block_offsets *dbo; - unsigned int cursor; - unsigned int nodes; -+ char filename_must_match; - - /* LZSS members */ - struct huffman_code maincode; -@@ -1560,6 +1561,12 @@ read_header(struct archive_read *a, struct archive_entry *entry, - } - return ret; - } -+ else if (rar->filename_must_match) -+ { -+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, -+ "Mismatch of file parts split across multi-volume archive"); -+ return (ARCHIVE_FATAL); -+ } - - rar->filename_save = (char*)realloc(rar->filename_save, - filename_size + 1); -@@ -2933,12 +2940,14 @@ rar_read_ahead(struct archive_read *a, size_t min, ssize_t *avail) - else if (*avail == 0 && rar->main_flags & MHD_VOLUME && - rar->file_flags & FHD_SPLIT_AFTER) - { -+ rar->filename_must_match = 1; - ret = archive_read_format_rar_read_header(a, a->entry); - if (ret == (ARCHIVE_EOF)) - { - rar->has_endarc_header = 1; - ret = archive_read_format_rar_read_header(a, a->entry); - } -+ rar->filename_must_match = 0; - if (ret != (ARCHIVE_OK)) - return NULL; - return rar_read_ahead(a, min, avail); --- -2.20.0 - diff --git a/poky/meta/recipes-extended/libarchive/libarchive/CVE-2018-1000879.patch b/poky/meta/recipes-extended/libarchive/libarchive/CVE-2018-1000879.patch deleted file mode 100644 index 9f25932a1..000000000 --- a/poky/meta/recipes-extended/libarchive/libarchive/CVE-2018-1000879.patch +++ /dev/null @@ -1,50 +0,0 @@ -CVE: CVE-2018-1000879 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 15bf44fd2c1ad0e3fd87048b3fcc90c4dcff1175 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens <dja@axtens.net> -Date: Tue, 4 Dec 2018 14:29:42 +1100 -Subject: [PATCH] Skip 0-length ACL fields - -Currently, it is possible to create an archive that crashes bsdtar -with a malformed ACL: - -Program received signal SIGSEGV, Segmentation fault. -archive_acl_from_text_l (acl=<optimised out>, text=0x7e2e92 "", want_type=<optimised out>, sc=<optimised out>) at libarchive/archive_acl.c:1726 -1726 switch (*s) { -(gdb) p n -$1 = 1 -(gdb) p field[n] -$2 = {start = 0x0, end = 0x0} - -Stop this by checking that the length is not zero before beginning -the switch statement. - -I am pretty sure this is the bug mentioned in the qsym paper [1], -and I was able to replicate it with a qsym + AFL + afl-rb setup. - -[1] https://www.usenix.org/conference/usenixsecurity18/presentation/yun ---- - libarchive/archive_acl.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libarchive/archive_acl.c b/libarchive/archive_acl.c -index 512beee1..7beeee86 100644 ---- a/libarchive/archive_acl.c -+++ b/libarchive/archive_acl.c -@@ -1723,6 +1723,11 @@ archive_acl_from_text_l(struct archive_acl *acl, const char *text, - st = field[n].start + 1; - len = field[n].end - field[n].start; - -+ if (len == 0) { -+ ret = ARCHIVE_WARN; -+ continue; -+ } -+ - switch (*s) { - case 'u': - if (len == 1 || (len == 4 --- -2.20.0 - diff --git a/poky/meta/recipes-extended/libarchive/libarchive/CVE-2018-1000880.patch b/poky/meta/recipes-extended/libarchive/libarchive/CVE-2018-1000880.patch deleted file mode 100644 index bc264a124..000000000 --- a/poky/meta/recipes-extended/libarchive/libarchive/CVE-2018-1000880.patch +++ /dev/null @@ -1,44 +0,0 @@ -CVE: CVE-2018-1000880 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 9c84b7426660c09c18cc349f6d70b5f8168b5680 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens <dja@axtens.net> -Date: Tue, 4 Dec 2018 16:33:42 +1100 -Subject: [PATCH] warc: consume data once read - -The warc decoder only used read ahead, it wouldn't actually consume -data that had previously been printed. This means that if you specify -an invalid content length, it will just reprint the same data over -and over and over again until it hits the desired length. - -This means that a WARC resource with e.g. -Content-Length: 666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666665 -but only a few hundred bytes of data, causes a quasi-infinite loop. - -Consume data in subsequent calls to _warc_read. - -Found with an AFL + afl-rb + qsym setup. ---- - libarchive/archive_read_support_format_warc.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libarchive/archive_read_support_format_warc.c b/libarchive/archive_read_support_format_warc.c -index e8753853..e8fc8428 100644 ---- a/libarchive/archive_read_support_format_warc.c -+++ b/libarchive/archive_read_support_format_warc.c -@@ -386,6 +386,11 @@ _warc_read(struct archive_read *a, const void **buf, size_t *bsz, int64_t *off) - return (ARCHIVE_EOF); - } - -+ if (w->unconsumed) { -+ __archive_read_consume(a, w->unconsumed); -+ w->unconsumed = 0U; -+ } -+ - rab = __archive_read_ahead(a, 1U, &nrd); - if (nrd < 0) { - *bsz = 0U; --- -2.20.0 - diff --git a/poky/meta/recipes-extended/libarchive/libarchive/CVE-2019-1000019.patch b/poky/meta/recipes-extended/libarchive/libarchive/CVE-2019-1000019.patch deleted file mode 100644 index 7f39893c2..000000000 --- a/poky/meta/recipes-extended/libarchive/libarchive/CVE-2019-1000019.patch +++ /dev/null @@ -1,59 +0,0 @@ -CVE: CVE-2019-1000019 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 65a23f5dbee4497064e9bb467f81138a62b0dae1 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens <dja@axtens.net> -Date: Tue, 1 Jan 2019 16:01:40 +1100 -Subject: [PATCH 2/2] 7zip: fix crash when parsing certain archives - -Fuzzing with CRCs disabled revealed that a call to get_uncompressed_data() -would sometimes fail to return at least 'minimum' bytes. This can cause -the crc32() invocation in header_bytes to read off into invalid memory. - -A specially crafted archive can use this to cause a crash. - -An ASAN trace is below, but ASAN is not required - an uninstrumented -binary will also crash. - -==7719==ERROR: AddressSanitizer: SEGV on unknown address 0x631000040000 (pc 0x7fbdb3b3ec1d bp 0x7ffe77a51310 sp 0x7ffe77a51150 T0) -==7719==The signal is caused by a READ memory access. - #0 0x7fbdb3b3ec1c in crc32_z (/lib/x86_64-linux-gnu/libz.so.1+0x2c1c) - #1 0x84f5eb in header_bytes (/tmp/libarchive/bsdtar+0x84f5eb) - #2 0x856156 in read_Header (/tmp/libarchive/bsdtar+0x856156) - #3 0x84e134 in slurp_central_directory (/tmp/libarchive/bsdtar+0x84e134) - #4 0x849690 in archive_read_format_7zip_read_header (/tmp/libarchive/bsdtar+0x849690) - #5 0x5713b7 in _archive_read_next_header2 (/tmp/libarchive/bsdtar+0x5713b7) - #6 0x570e63 in _archive_read_next_header (/tmp/libarchive/bsdtar+0x570e63) - #7 0x6f08bd in archive_read_next_header (/tmp/libarchive/bsdtar+0x6f08bd) - #8 0x52373f in read_archive (/tmp/libarchive/bsdtar+0x52373f) - #9 0x5257be in tar_mode_x (/tmp/libarchive/bsdtar+0x5257be) - #10 0x51daeb in main (/tmp/libarchive/bsdtar+0x51daeb) - #11 0x7fbdb27cab96 in __libc_start_main /build/glibc-OTsEL5/glibc-2.27/csu/../csu/libc-start.c:310 - #12 0x41dd09 in _start (/tmp/libarchive/bsdtar+0x41dd09) - -This was primarly done with afl and FairFuzz. Some early corpus entries -may have been generated by qsym. ---- - libarchive/archive_read_support_format_7zip.c | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/libarchive/archive_read_support_format_7zip.c b/libarchive/archive_read_support_format_7zip.c -index bccbf8966..b6d1505d3 100644 ---- a/libarchive/archive_read_support_format_7zip.c -+++ b/libarchive/archive_read_support_format_7zip.c -@@ -2964,13 +2964,7 @@ get_uncompressed_data(struct archive_read *a, const void **buff, size_t size, - if (zip->codec == _7Z_COPY && zip->codec2 == (unsigned long)-1) { - /* Copy mode. */ - -- /* -- * Note: '1' here is a performance optimization. -- * Recall that the decompression layer returns a count of -- * available bytes; asking for more than that forces the -- * decompressor to combine reads by copying data. -- */ -- *buff = __archive_read_ahead(a, 1, &bytes_avail); -+ *buff = __archive_read_ahead(a, minimum, &bytes_avail); - if (bytes_avail <= 0) { - archive_set_error(&a->archive, - ARCHIVE_ERRNO_FILE_FORMAT, diff --git a/poky/meta/recipes-extended/libarchive/libarchive/CVE-2019-1000020.patch b/poky/meta/recipes-extended/libarchive/libarchive/CVE-2019-1000020.patch deleted file mode 100644 index 25a76fdcd..000000000 --- a/poky/meta/recipes-extended/libarchive/libarchive/CVE-2019-1000020.patch +++ /dev/null @@ -1,61 +0,0 @@ -CVE: CVE-2019-1000020 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 8312eaa576014cd9b965012af51bc1f967b12423 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens <dja@axtens.net> -Date: Tue, 1 Jan 2019 17:10:49 +1100 -Subject: [PATCH 1/2] iso9660: Fail when expected Rockridge extensions is - missing - -A corrupted or malicious ISO9660 image can cause read_CE() to loop -forever. - -read_CE() calls parse_rockridge(), expecting a Rockridge extension -to be read. However, parse_rockridge() is structured as a while -loop starting with a sanity check, and if the sanity check fails -before the loop has run, the function returns ARCHIVE_OK without -advancing the position in the file. This causes read_CE() to retry -indefinitely. - -Make parse_rockridge() return ARCHIVE_WARN if it didn't read an -extension. As someone with no real knowledge of the format, this -seems more apt than ARCHIVE_FATAL, but both the call-sites escalate -it to a fatal error immediately anyway. - -Found with a combination of AFL, afl-rb (FairFuzz) and qsym. ---- - libarchive/archive_read_support_format_iso9660.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c -index 28acfefbb..bad8f1dfe 100644 ---- a/libarchive/archive_read_support_format_iso9660.c -+++ b/libarchive/archive_read_support_format_iso9660.c -@@ -2102,6 +2102,7 @@ parse_rockridge(struct archive_read *a, struct file_info *file, - const unsigned char *p, const unsigned char *end) - { - struct iso9660 *iso9660; -+ int entry_seen = 0; - - iso9660 = (struct iso9660 *)(a->format->data); - -@@ -2257,8 +2258,16 @@ parse_rockridge(struct archive_read *a, struct file_info *file, - } - - p += p[2]; -+ entry_seen = 1; -+ } -+ -+ if (entry_seen) -+ return (ARCHIVE_OK); -+ else { -+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, -+ "Tried to parse Rockridge extensions, but none found"); -+ return (ARCHIVE_WARN); - } -- return (ARCHIVE_OK); - } - - static int - diff --git a/poky/meta/recipes-extended/libarchive/libarchive/bug1066.patch b/poky/meta/recipes-extended/libarchive/libarchive/bug1066.patch deleted file mode 100644 index 0a662b57b..000000000 --- a/poky/meta/recipes-extended/libarchive/libarchive/bug1066.patch +++ /dev/null @@ -1,54 +0,0 @@ -libarchive-3.3.3: Fix bug1066 - -[No upstream tracking] -- https://github.com/libarchive/libarchive/pull/1066 - -archive_write_set_format_*.c: fix out of bounds read on empty string () filename -for guntar, pax and v7tar - -There is an out of bounds read flaw in the archive_write_gnutar_header, -archive_write_pax_header and archive_write_v7tar_header functions which -could leds to cause a denial of service. - -Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/c246ec5d058a3f70a2d3fb765f92fe9db77b25df] -Bug: 1066 -Signed-off-by: Andrej Valek <andrej.valek@siemens.com> - -diff --git a/libarchive/archive_write_set_format_gnutar.c b/libarchive/archive_write_set_format_gnutar.c -index 2d858c9..1966c53 100644 ---- a/libarchive/archive_write_set_format_gnutar.c -+++ b/libarchive/archive_write_set_format_gnutar.c -@@ -339,7 +339,7 @@ archive_write_gnutar_header(struct archive_write *a, - * case getting WCS failed. On POSIX, this is a - * normal operation. - */ -- if (p != NULL && p[strlen(p) - 1] != '/') { -+ if (p != NULL && p[0] != '\0' && p[strlen(p) - 1] != '/') { - struct archive_string as; - - archive_string_init(&as); -diff --git a/libarchive/archive_write_set_format_pax.c b/libarchive/archive_write_set_format_pax.c -index 6a301ac..4cfa8ff 100644 ---- a/libarchive/archive_write_set_format_pax.c -+++ b/libarchive/archive_write_set_format_pax.c -@@ -660,7 +660,7 @@ archive_write_pax_header(struct archive_write *a, - * case getting WCS failed. On POSIX, this is a - * normal operation. - */ -- if (p != NULL && p[strlen(p) - 1] != '/') { -+ if (p != NULL && p[0] != '\0' && p[strlen(p) - 1] != '/') { - struct archive_string as; - - archive_string_init(&as); -diff --git a/libarchive/archive_write_set_format_v7tar.c b/libarchive/archive_write_set_format_v7tar.c -index 62b1522..53c0db0 100644 ---- a/libarchive/archive_write_set_format_v7tar.c -+++ b/libarchive/archive_write_set_format_v7tar.c -@@ -284,7 +284,7 @@ archive_write_v7tar_header(struct archive_write *a, struct archive_entry *entry) - * case getting WCS failed. On POSIX, this is a - * normal operation. - */ -- if (p != NULL && p[strlen(p) - 1] != '/') { -+ if (p != NULL && p[0] != '\0' && p[strlen(p) - 1] != '/') { - struct archive_string as; - - archive_string_init(&as); diff --git a/poky/meta/recipes-extended/libarchive/libarchive/non-recursive-extract-and-list.patch b/poky/meta/recipes-extended/libarchive/libarchive/non-recursive-extract-and-list.patch deleted file mode 100644 index cd7be5127..000000000 --- a/poky/meta/recipes-extended/libarchive/libarchive/non-recursive-extract-and-list.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 47f7566f6829c2b14e21bbbba699916de4998c72 Mon Sep 17 00:00:00 2001 -From: Patrick Ohly <patrick.ohly@intel.com> -Date: Mon, 24 Oct 2016 12:54:48 +0200 -Subject: [PATCH 1/1] non-recursive extract and list - -Sometimes it makes sense to extract or list a directory contained in -an archive without also doing the same for the content of the -directory, i.e. allowing -n (= --no-recursion) in combination with the -x and t modes. - -bsdtar uses the match functionality in libarchive to track include -matches. A new libarchive API call -archive_match_include_directories_recursively() gets introduced to -influence the matching behavior, with the default behavior as before. - -Non-recursive matching can be achieved by anchoring the path match at -both start and end. Asking for a directory which itself isn't in the -archive when in non-recursive mode is an error and handled by the -existing mechanism for tracking unused inclusion entries. - -Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/812] - -Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> - ---- - libarchive/archive.h | 2 ++ - libarchive/archive_match.c | 30 +++++++++++++++++++++++++++++- - tar/bsdtar.1 | 3 +-- - tar/bsdtar.c | 12 ++++++++++-- - 4 files changed, 42 insertions(+), 5 deletions(-) - -diff --git a/libarchive/archive.h b/libarchive/archive.h -index 32710201..59fb4aa6 100644 ---- a/libarchive/archive.h -+++ b/libarchive/archive.h -@@ -1093,6 +1093,8 @@ __LA_DECL int archive_match_excluded(struct archive *, - */ - __LA_DECL int archive_match_path_excluded(struct archive *, - struct archive_entry *); -+/* Control recursive inclusion of directory content when directory is included. Default on. */ -+__LA_DECL int archive_match_include_directories_recursively(struct archive *, int _enabled); - /* Add exclusion pathname pattern. */ - __LA_DECL int archive_match_exclude_pattern(struct archive *, const char *); - __LA_DECL int archive_match_exclude_pattern_w(struct archive *, -diff --git a/libarchive/archive_match.c b/libarchive/archive_match.c -index be72066e..bb6a3407 100644 ---- a/libarchive/archive_match.c -+++ b/libarchive/archive_match.c -@@ -93,6 +93,9 @@ struct archive_match { - /* exclusion/inclusion set flag. */ - int setflag; - -+ /* Recursively include directory content? */ -+ int recursive_include; -+ - /* - * Matching filename patterns. - */ -@@ -223,6 +226,7 @@ archive_match_new(void) - return (NULL); - a->archive.magic = ARCHIVE_MATCH_MAGIC; - a->archive.state = ARCHIVE_STATE_NEW; -+ a->recursive_include = 1; - match_list_init(&(a->inclusions)); - match_list_init(&(a->exclusions)); - __archive_rb_tree_init(&(a->exclusion_tree), &rb_ops_mbs); -@@ -471,6 +475,28 @@ archive_match_path_excluded(struct archive *_a, - } - - /* -+ * When recursive inclusion of directory content is enabled, -+ * an inclusion pattern that matches a directory will also -+ * include everything beneath that directory. Enabled by default. -+ * -+ * For compatibility with GNU tar, exclusion patterns always -+ * match if a subset of the full patch matches (i.e., they are -+ * are not rooted at the beginning of the path) and thus there -+ * is no corresponding non-recursive exclusion mode. -+ */ -+int -+archive_match_include_directories_recursively(struct archive *_a, int _enabled) -+{ -+ struct archive_match *a; -+ -+ archive_check_magic(_a, ARCHIVE_MATCH_MAGIC, -+ ARCHIVE_STATE_NEW, "archive_match_include_directories_recursively"); -+ a = (struct archive_match *)_a; -+ a->recursive_include = _enabled; -+ return (ARCHIVE_OK); -+} -+ -+/* - * Utility functions to get statistic information for inclusion patterns. - */ - int -@@ -781,7 +807,9 @@ static int - match_path_inclusion(struct archive_match *a, struct match *m, - int mbs, const void *pn) - { -- int flag = PATHMATCH_NO_ANCHOR_END; -+ int flag = a->recursive_include ? -+ PATHMATCH_NO_ANCHOR_END : /* Prefix match is good enough. */ -+ 0; /* Full match required. */ - int r; - - if (mbs) { -diff --git a/tar/bsdtar.1 b/tar/bsdtar.1 -index 132e1145..1dd2a847 100644 ---- a/tar/bsdtar.1 -+++ b/tar/bsdtar.1 -@@ -386,8 +386,7 @@ and the default behavior in c, r, and u modes or if - .Nm - is run in x mode as root. - .It Fl n , Fl Fl norecurse , Fl Fl no-recursion --(c, r, u modes only) --Do not recursively archive the contents of directories. -+Do not recursively archive (c, r, u), extract (x) or list (t) the contents of directories. - .It Fl Fl newer Ar date - (c, r, u modes only) - Only include files and directories newer than the specified date. -diff --git a/tar/bsdtar.c b/tar/bsdtar.c -index 11dedbf9..d014cc3e 100644 ---- a/tar/bsdtar.c -+++ b/tar/bsdtar.c -@@ -794,8 +794,6 @@ main(int argc, char **argv) - break; - } - } -- if (bsdtar->flags & OPTFLAG_NO_SUBDIRS) -- only_mode(bsdtar, "-n", "cru"); - if (bsdtar->flags & OPTFLAG_STDOUT) - only_mode(bsdtar, "-O", "xt"); - if (bsdtar->flags & OPTFLAG_UNLINK_FIRST) -@@ -845,6 +843,16 @@ main(int argc, char **argv) - only_mode(bsdtar, buff, "cru"); - } - -+ /* -+ * When creating an archive from a directory tree, the directory -+ * walking code will already avoid entering directories when -+ * recursive inclusion of directory content is disabled, therefore -+ * changing the matching behavior has no effect for creation modes. -+ * It is relevant for extraction or listing. -+ */ -+ archive_match_include_directories_recursively(bsdtar->matching, -+ !(bsdtar->flags & OPTFLAG_NO_SUBDIRS)); -+ - /* Filename "-" implies stdio. */ - if (strcmp(bsdtar->filename, "-") == 0) - bsdtar->filename = NULL; --- -2.11.0 - diff --git a/poky/meta/recipes-extended/libarchive/libarchive_3.3.3.bb b/poky/meta/recipes-extended/libarchive/libarchive_3.4.0.bb index af5ca6529..c789cd44d 100644 --- a/poky/meta/recipes-extended/libarchive/libarchive_3.3.3.bb +++ b/poky/meta/recipes-extended/libarchive/libarchive_3.4.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "C library and command-line tools for reading and writing tar, cpi HOMEPAGE = "http://www.libarchive.org/" SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=ed99aca006bc346974bb745a35336425" +LIC_FILES_CHKSUM = "file://COPYING;md5=fe01f5e02b1f0cc934d593a7b0ddceb6" DEPENDS = "e2fsprogs-native" @@ -32,18 +32,10 @@ PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," EXTRA_OECONF += "--enable-largefile" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ - file://non-recursive-extract-and-list.patch \ - file://bug1066.patch \ - file://CVE-2018-1000877.patch \ - file://CVE-2018-1000878.patch \ - file://CVE-2018-1000879.patch \ - file://CVE-2018-1000880.patch \ - file://CVE-2019-1000019.patch \ - file://CVE-2019-1000020.patch \ " -SRC_URI[md5sum] = "4038e366ca5b659dae3efcc744e72120" -SRC_URI[sha256sum] = "ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e" +SRC_URI[md5sum] = "6046396255bd7cf6d0f6603a9bda39ac" +SRC_URI[sha256sum] = "8643d50ed40c759f5412a3af4e353cffbce4fdf3b5cf321cb72cacf06b2d825e" inherit autotools update-alternatives pkgconfig diff --git a/poky/meta/recipes-extended/libsolv/libsolv_0.7.5.bb b/poky/meta/recipes-extended/libsolv/libsolv_0.7.6.bb index 80ce76b45..3df899308 100644 --- a/poky/meta/recipes-extended/libsolv/libsolv_0.7.5.bb +++ b/poky/meta/recipes-extended/libsolv/libsolv_0.7.6.bb @@ -10,7 +10,7 @@ DEPENDS = "expat zlib" SRC_URI = "git://github.com/openSUSE/libsolv.git \ " -SRCREV = "2cab7ea00d08390374b25b11d969f3740c4660f4" +SRCREV = "17ce4bc4fb52a0b32964f3b7d491c18177980be1" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" diff --git a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb index ba1a2c54b..72990d02e 100644 --- a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb +++ b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb @@ -44,7 +44,7 @@ PACKAGECONFIG[webdav-props] = "--with-webdav-props,--without-webdav-props,libxml PACKAGECONFIG[webdav-locks] = "--with-webdav-locks,--without-webdav-locks,util-linux" PACKAGECONFIG[gdbm] = "--with-gdbm,--without-gdbm,gdbm" PACKAGECONFIG[memcache] = "--with-memcached,--without-memcached,libmemcached" -PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua5.1" +PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua" EXTRA_OECONF += "--enable-lfs" diff --git a/poky/meta/recipes-extended/logrotate/logrotate_3.15.0.bb b/poky/meta/recipes-extended/logrotate/logrotate_3.15.1.bb index 0f3da2b94..7c7d51b39 100644 --- a/poky/meta/recipes-extended/logrotate/logrotate_3.15.0.bb +++ b/poky/meta/recipes-extended/logrotate/logrotate_3.15.1.bb @@ -25,8 +25,8 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz file://disable-check-different-filesystems.patch \ " -SRC_URI[md5sum] = "320046f0b9fc38337e8827d4c5a866a0" -SRC_URI[sha256sum] = "313612c4776a305393454c874ef590d8acf84c9ffa648717731dfe902284ff8f" +SRC_URI[md5sum] = "afe109afea749c306ff489203fde6beb" +SRC_URI[sha256sum] = "491fec9e89f1372f02a0ab66579aa2e9d63cac5178dfa672c204c88e693a908b" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}" diff --git a/poky/meta/recipes-extended/lsb/lsb/0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch b/poky/meta/recipes-extended/lsb/lsb-release/0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch index 017575206..017575206 100644 --- a/poky/meta/recipes-extended/lsb/lsb/0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch +++ b/poky/meta/recipes-extended/lsb/lsb-release/0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch diff --git a/poky/meta/recipes-extended/lsb/lsb-release_1.4.bb b/poky/meta/recipes-extended/lsb/lsb-release_1.4.bb new file mode 100644 index 000000000..52e30267f --- /dev/null +++ b/poky/meta/recipes-extended/lsb/lsb-release_1.4.bb @@ -0,0 +1,36 @@ +SUMMARY = "lsb_release support for OpenEmbedded" +SECTION = "console/utils" +HOMEPAGE = "http://prdownloads.sourceforge.net/lsb" +LICENSE = "GPLv2+" + +# lsb_release needs getopt +RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_getopt}" + +LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ + file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \ + " + +SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" +SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172" + +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lsb/files/lsb_release/" +UPSTREAM_CHECK_REGEX = "/lsb_release/(?P<pver>(\d+[\.\-_]*)+)/" + +CLEANBROKEN = "1" + +do_install() { + oe_runmake install prefix=${D}${root_prefix} mandir=${D}${datadir}/man/ DESTDIR=${D} + + mkdir -p ${D}${sysconfdir}/lsb-release.d + + echo "DISTRIB_ID=${DISTRO}" >> ${D}${sysconfdir}/lsb-release + echo "DISTRIB_RELEASE=${DISTRO_VERSION}" >> ${D}${sysconfdir}/lsb-release + if [ -n "${DISTRO_CODENAME}" ]; then + echo "DISTRIB_CODENAME=${DISTRO_CODENAME}" >> ${D}${sysconfdir}/lsb-release + fi + echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}${sysconfdir}/lsb-release +} + +FILES_${PN} += "${base_libdir}" diff --git a/poky/meta/recipes-extended/lsb/lsb/init-functions b/poky/meta/recipes-extended/lsb/lsb/init-functions deleted file mode 100755 index 7c1dce24c..000000000 --- a/poky/meta/recipes-extended/lsb/lsb/init-functions +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -# LSB initscript functions, as defined in the LSB Spec 1.1.0 -# -# Lawrence Lim <llim@core.com> - Tue, 26 June 2007 -# Updated to the latest LSB 3.1 spec -# http://refspecs.freestandards.org/LSB_3.1.0/LSB-Core-generic/LSB-Core-generic_lines.txt - -start_daemon () { - /etc/core-lsb/lsb_start_daemon "$@" -} - -killproc () { - /etc/core-lsb/lsb_killproc "$@" -} - -pidofproc () { - /etc/core-lsb/lsb_pidofproc "$@" -} - -log_success_msg () { - /etc/core-lsb/lsb_log_message success "$@" -} - -log_failure_msg () { - /etc/core-lsb/lsb_log_message failure "$@" -} - -log_warning_msg () { - /etc/core-lsb/lsb_log_message warning "$@" -} - -# int log_begin_message (char *message) -log_begin_msg () { - if [ -z "$1" ]; then - return 1 - fi - echo " * $@" -} - - -log_end_msg () { - /etc/core-lsb/lsb_log_message end "$@" -} diff --git a/poky/meta/recipes-extended/lsb/lsb/lsb_killproc b/poky/meta/recipes-extended/lsb/lsb/lsb_killproc deleted file mode 100755 index 866c1a9c6..000000000 --- a/poky/meta/recipes-extended/lsb/lsb/lsb_killproc +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -. /etc/init.d/functions - -LSB=LSB-1.1 killproc $* -exit $? diff --git a/poky/meta/recipes-extended/lsb/lsb/lsb_log_message b/poky/meta/recipes-extended/lsb/lsb/lsb_log_message deleted file mode 100755 index 10343b081..000000000 --- a/poky/meta/recipes-extended/lsb/lsb/lsb_log_message +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -. /etc/init.d/functions - -ACTION=$1 -shift - -case "$ACTION" in - success) - echo -n $* - success "$*" - echo - ;; - failure) - echo -n $* - failure "$*" - echo - ;; - warning) - echo -n $* - warning "$*" - echo - ;; - *) - ;; -esac -exit 0 diff --git a/poky/meta/recipes-extended/lsb/lsb/lsb_pidofproc b/poky/meta/recipes-extended/lsb/lsb/lsb_pidofproc deleted file mode 100755 index 6d1fd0f24..000000000 --- a/poky/meta/recipes-extended/lsb/lsb/lsb_pidofproc +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -. /etc/init.d/functions - -pidofproc $* -exit $? diff --git a/poky/meta/recipes-extended/lsb/lsb/lsb_start_daemon b/poky/meta/recipes-extended/lsb/lsb/lsb_start_daemon deleted file mode 100755 index de62c2344..000000000 --- a/poky/meta/recipes-extended/lsb/lsb/lsb_start_daemon +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -. /etc/init.d/functions - -nice= -force= -pidfile= -user= -check= -RETVAL= -while [ "$1" != "${1##[-+]}" ]; do - case $1 in - -f) - force="--force" - shift - ;; - -n) - nice=$2 - shift 2 - ;; - -p) - pidfile="--pidfile $2" - shift 2 - ;; - -u) - user="--user $2" - shift 2 - ;; - -c) - check="--check $2" - shift 2 - ;; - *) - echo "Unknown Option $1" - echo "Options are:" - echo "-f" - echo "-p {pidfile}" - echo "-n [+/-nicelevel]" - echo "-u {user}" - echo "-c {base}" - exit 1;; - esac -done -LSB=LSB-1.1 daemon ${force:-} ${nice:-} ${pidfile:-} ${user:-} ${check:-} $* -exit $? diff --git a/poky/meta/recipes-extended/lsb/lsb_5.0.bb b/poky/meta/recipes-extended/lsb/lsb_5.0.bb deleted file mode 100644 index d1de33400..000000000 --- a/poky/meta/recipes-extended/lsb/lsb_5.0.bb +++ /dev/null @@ -1,136 +0,0 @@ -SUMMARY = "LSB support for OpenEmbedded" -SECTION = "console/utils" -HOMEPAGE = "http://prdownloads.sourceforge.net/lsb" -LICENSE = "GPLv2+" - -LSB_CORE = "lsb-core-${TARGET_ARCH}" -LSB_CORE_x86 = "lsb-core-ia32" -LSB_CORE_x86-64 = "lsb-core-amd64" -RPROVIDES_${PN} += "${LSB_CORE}" - -# lsb_release needs getopt, lsbinitscripts -RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_getopt} lsbinitscripts" - -LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ - file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \ - file://init-functions \ - file://lsb_killproc \ - file://lsb_log_message \ - file://lsb_pidofproc \ - file://lsb_start_daemon \ - " -UPSTREAM_VERSION_UNKNOWN = "1" - -SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" -SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lsb/files/lsb_release/" -UPSTREAM_CHECK_REGEX = "/lsb_release/(?P<pver>(\d+[\.\-_]*)+)/" - -S = "${WORKDIR}/lsb-release-1.4" - -CLEANBROKEN = "1" - -do_install() { - oe_runmake install prefix=${D}${root_prefix} mandir=${D}${datadir}/man/ DESTDIR=${D} - - # these two dirs are needed by package lsb-dist-checker - mkdir -p ${D}${sysconfdir}/opt - mkdir -p ${D}${localstatedir}/opt - - mkdir -p ${D}${base_libdir} - mkdir -p ${D}${sysconfdir}/lsb-release.d - printf "LSB_VERSION=\"core-5.0-noarch:" > ${D}${sysconfdir}/lsb-release - - if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ]; then - printf "core-5.0-ia32" >> ${D}${sysconfdir}/lsb-release - else - printf "core-5.0-${TARGET_ARCH}" >> ${D}${sysconfdir}/lsb-release - fi - echo "\"" >> ${D}${sysconfdir}/lsb-release - echo "DISTRIB_ID=${DISTRO}" >> ${D}${sysconfdir}/lsb-release - echo "DISTRIB_RELEASE=${DISTRO_VERSION}" >> ${D}${sysconfdir}/lsb-release - if [ -n "${DISTRO_CODENAME}" ]; then - echo "DISTRIB_CODENAME=${DISTRO_CODENAME}" >> ${D}${sysconfdir}/lsb-release - fi - echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}${sysconfdir}/lsb-release - - if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ]; then - mkdir -p ${D}${sysconfdir}/lsb-release.d - touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-noarch - touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-noarch - touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-ia32 - touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-ia32 - elif [ "${TARGET_ARCH}" = "x86_64" ]; then - touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-noarch - touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-amd64 - touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-amd64 - fi - if [ "${TARGET_ARCH}" = "powerpc" ]; then - touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-noarch - touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-ppc32 - touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-ppc32 - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-noarch - touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-ppc64 - touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-ppc64 - fi -} - -do_install_append() { - install -d ${D}${sysconfdir}/core-lsb - for i in lsb_killproc lsb_log_message lsb_pidofproc lsb_start_daemon - do - install -m 0755 ${WORKDIR}/$i ${D}${sysconfdir}/core-lsb - done - - install -d ${D}${nonarch_base_libdir}/lsb - install -m 0755 ${WORKDIR}/init-functions ${D}${nonarch_base_libdir}/lsb - - # create links for LSB test - if [ -e ${sbindir}/chkconfig ]; then - if [ "${nonarch_base_libdir}" != "${nonarch_libdir}" ] ; then - install -d ${D}${nonarch_libdir}/lsb - fi - ln -sf ${sbindir}/chkconfig ${D}${nonarch_libdir}/lsb/install_initd - ln -sf ${sbindir}/chkconfig ${D}${nonarch_libdir}/lsb/remove_initd - fi - - if [ "${TARGET_ARCH}" = "x86_64" ]; then - # don't symlink if usrmerge is in DISTRO_FEATURES as it manages the symlink - if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)} && \ - [ "${base_libdir}" != "${base_prefix}/lib64" ]; then - lnr ${D}${base_libdir} ${D}${base_prefix}/lib64 - fi - cd ${D}${base_libdir} - ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2 - ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3 - fi - if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ]; then - cd ${D}${base_libdir} - ln -sf ld-linux.so.2 ld-lsb.so.2 - ln -sf ld-linux.so.2 ld-lsb.so.3 - fi - - if [ "${TARGET_ARCH}" = "powerpc64" ]; then - if [ "${base_libdir}" != "${base_prefix}/lib64" ]; then - lnr ${D}${base_libdir} ${D}${base_prefix}/lib64 - fi - cd ${D}${base_libdir} - ln -sf ld64.so.1 ld-lsb-ppc64.so.2 - ln -sf ld64.so.1 ld-lsb-ppc64.so.3 - fi - if [ "${TARGET_ARCH}" = "powerpc" ]; then - cd ${D}${base_libdir} - ln -sf ld.so.1 ld-lsb-ppc32.so.2 - ln -sf ld.so.1 ld-lsb-ppc32.so.3 - fi -} - -FILES_${PN} += "${@'${base_prefix}/lib64' if d.getVar('TARGET_ARCH') == ('x86_64' or 'powerpc64') and '${base_libdir}' != '${base_prefix}/lib64' else ''} \ - ${base_libdir} \ - ${nonarch_libdir}/lsb \ - ${nonarch_base_libdir}/lsb/* \ - " diff --git a/poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch b/poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch deleted file mode 100644 index c0076453f..000000000 --- a/poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch +++ /dev/null @@ -1,21 +0,0 @@ -Upstream-Status: Pending - -Subject: functions: avoid exit 1 which causes init scripts to fail - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - rc.d/init.d/functions | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: initscripts-9.72/rc.d/init.d/functions -=================================================================== ---- initscripts-9.72.orig/rc.d/init.d/functions -+++ initscripts-9.72/rc.d/init.d/functions -@@ -686,6 +686,6 @@ if [ "$_use_systemctl" = "1" ]; then - fi - fi - --strstr "$(cat /proc/cmdline)" "rc.debug" && set -x -+strstr "$(cat /proc/cmdline)" "rc.debug" && set -x || true - return 0 - diff --git a/poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch deleted file mode 100644 index e912daa70..000000000 --- a/poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e46b056282c8420f096d5c34d78c00f816788784 Mon Sep 17 00:00:00 2001 -From: Fan Xin <fan.xin@jp.fujitsu.com> -Date: Mon, 5 Jun 2017 16:26:47 +0900 -Subject: [PATCH 1/2] Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Rebase on 9.72 - -Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> -Upstream-Status: Pending - ---- - rc.d/init.d/functions | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions -index 2e3da964..1a204dec 100644 ---- a/rc.d/init.d/functions -+++ b/rc.d/init.d/functions -@@ -59,7 +59,7 @@ systemctl_redirect () { - [ -z "${COLUMNS:-}" ] && COLUMNS=80 - - if [ -z "${CONSOLETYPE:-}" ]; then -- if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ]; then -+ if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ] && [ -e /sbin/consoletype ]; then - CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" - else - CONSOLETYPE="serial" --- -2.15.1 - diff --git a/poky/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb b/poky/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb deleted file mode 100644 index 6d3fcf13d..000000000 --- a/poky/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "SysV init scripts which are only used in an LSB image" -HOMEPAGE = "https://wiki.debian.org/LSBInitScripts" -SECTION = "base" -LICENSE = "GPLv2" - -RPROVIDES_${PN} += "initd-functions" -RDEPENDS_${PN} += "util-linux" -RCONFLICTS_${PN} = "initscripts-functions" - -LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6" - -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/fedora-sysv/initscripts \ - file://functions.patch \ - file://0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch \ - " -SRCREV = "a51c1b4f7dcf55b568b2ee4c2b18078849943469" -UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)" - -SRC_URI[md5sum] = "d6c798f40dceb117e12126d94cb25a9a" -SRC_URI[sha256sum] = "1793677bdd1f7ee4cb00878ce43346196374f848a4c8e4559e086040fc7487db" - -# Since we are only taking the patched version of functions, no need to -# configure or compile anything so do not execute these -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install(){ - install -d ${D}${sysconfdir}/init.d/ - install -m 0644 ${S}/rc.d/init.d/functions ${D}${sysconfdir}/init.d/functions -} diff --git a/poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh b/poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh deleted file mode 100644 index 073e247a5..000000000 --- a/poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh +++ /dev/null @@ -1,525 +0,0 @@ -#!/bin/sh - -# Copyright (C) 2012 Wind River Systems, Inc. -# -# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -WORK_DIR="/opt/lsb-test" - -if [ `id -u` -ne 0 ] -then - cat << EOF - In order to install and run LSB testsuite, you need administrator privileges. - You are currently running this script as an unprivileged user. - -EOF - exit 1 -fi - -ARCH=`uname -m` -if [ ${ARCH} != "i686" ] && [ ${ARCH} != "x86_64" ] && [ ${ARCH} != "ppc" ] && [ ${ARCH} != "ppc64" ] -then - echo "Error: Unsupported architecture" - exit 1 -fi - -which rpm -if [ $? -ne 0 ] -then - echo "No rpm command found" - exit 1 -fi - -RET=0 - -cd ${WORK_DIR} || exit 1 -# Step 1: Download the LSB Packages -echo "" -echo "Download LSB packages..." -echo "" - -if [ ! -e ./packages_list ] -then - echo "Error: Could not find packages list" >&2 - exit 1 -fi - -. ./packages_list - -PACKAGES_DIR="/var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb" - -BASE_PACKAGES_DIR="${PACKAGES_DIR}/base/released-all/binary" -RUNTIME_BASE_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/released-all/binary/runtime" -RUNTIME_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/${LSB_RELEASE}/binary/runtime" -APP_PACKAGES_DIR="${PACKAGES_DIR}/app-battery/${LSB_RELEASE}/${LSB_ARCH}" -APP_TESTFILES_DIR="${PACKAGES_DIR}/app-battery/tests" -SNAPSHOTS_TESTFILES_DIR="${PACKAGES_DIR}/snapshots/appbat/tests" - -if [ ! -d ${PACKAGES_DIR} ] -then - mkdir -p ${PACKAGES_DIR} -fi - -if [ ! -d ${BASE_PACKAGES_DIR} ] -then - mkdir -p ${BASE_PACKAGES_DIR} -fi - -if [ ! -d ${RUNTIME_BASE_PACKAGES_DIR} ] -then - mkdir -p ${RUNTIME_BASE_PACKAGES_DIR} -fi - -if [ ! -d ${RUNTIME_PACKAGES_DIR} ] -then - mkdir -p ${RUNTIME_PACKAGES_DIR} -fi - -if [ ! -d ${APP_PACKAGES_DIR} ] -then - mkdir -p ${APP_PACKAGES_DIR} -fi - -if [ ! -d ${APP_TESTFILES_DIR} ] -then - mkdir -p ${APP_TESTFILES_DIR} -fi - -# Official download server list. You can replace them with your own server. -SERVER_IPADDR="140.211.169.28" -SERVER_NAME="ftp.linuxfoundation.org" - -if ! `grep -F -q "${SERVER_NAME}" /etc/hosts`; then - echo "${SERVER_IPADDR} ${SERVER_NAME} ${SERVER_NAME}" >> /etc/hosts -fi - -#ping -c 5 ${SERVER_NAME} -#if [ $? -ne 0 ] -#then -# echo "The server: ${SERVER_NAME} is unreachable" -# exit 1 -#fi - -SERVER1="\ - http://${SERVER_NAME}/pub/lsb/base/released-all/binary" -SERVER2="\ - http://${SERVER_NAME}/pub/lsb/test_suites/released-all/binary/runtime" -SERVER3="\ - http://${SERVER_NAME}/pub/lsb/test_suites/${LSB_RELEASE}/binary/runtime" -SERVER4="\ - http://${SERVER_NAME}/pub/lsb/app-battery/${LSB_RELEASE}/${LSB_ARCH}" -SERVER5="\ - http://${SERVER_NAME}/pub/lsb/app-battery/tests" - -# We using "curl" as a download tool, "wget" is an alternative. -CURL=`which curl` -WGET=`which wget` -if [ ! -z ${CURL} ] -then - DOWNLOAD_CMD="${CURL} -R -L -f --retry 3 --retry-delay 4 --connect-timeout 180 --compressed -C - -o" -elif [ ! -z ${WGET} ] -then - DOWNLOAD_CMD="${WGET} -c -t 5 -O" -else - echo "Can not find a download tool, please install curl or wget." - exit 1 -fi - -cd ${BASE_PACKAGES_DIR} -for pkg in ${BASE_PACKAGES_LIST}; do - if [ ! -f ${pkg} ] - then - #${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER1}/${pkg} > /dev/null 2>&1 - ${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER1}/${pkg} - if [ $? -eq 0 ] - then - mv -f ${pkg}".#part" ${pkg} - echo "Download ${pkg} successfully." - else - echo "Download ${pkg} failed." - RET=1 - fi - fi -done - -cd ${RUNTIME_BASE_PACKAGES_DIR} -for pkg in ${RUNTIME_BASE_PACKAGES_LIST}; do - if [ ! -f ${pkg} ] - then - #${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER2}/${pkg} > /dev/null 2>&1 - ${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER2}/${pkg} - if [ $? -eq 0 ] - then - mv -f ${pkg}".#part" ${pkg} - echo "Download ${pkg} successfully." - else - echo "Download ${pkg} failed." - RET=1 - fi - fi -done - -cd ${RUNTIME_PACKAGES_DIR} -for pkg in ${RUNTIME_PACKAGES_LIST}; do - if [ ! -f ${pkg} ] - then - #${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER3}/${pkg} > /dev/null 2>&1 - ${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER3}/${pkg} - if [ $? -eq 0 ] - then - mv -f ${pkg}".#part" ${pkg} - echo "Download ${pkg} successfully." - else - echo "Download ${pkg} failed." - RET=1 - fi - fi -done - -cd ${APP_PACKAGES_DIR} -for pkg in ${APP_PACKAGES_LIST}; do - if [ ! -f ${pkg} ] - then - #${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER4}/${pkg} > /dev/null 2>&1 - ${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER4}/${pkg} - if [ $? -eq 0 ] - then - mv -f ${pkg}".#part" ${pkg} - echo "Download ${pkg} successfully." - else - echo "Download ${pkg} failed." - RET=1 - fi - fi -done - -cd ${APP_TESTFILES_DIR} -for pkg in ${APP_TESTFILES_LIST}; do - if [ ! -f ${pkg} ] - then - #${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER5}/${pkg} > /dev/null 2>&1 - ${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER5}/${pkg} - if [ $? -eq 0 ] - then - mv -f ${pkg}".#part" ${pkg} - echo "Download ${pkg} successfully." - else - echo "Download ${pkg} failed." - RET=1 - fi - fi -done - -if [ ${RET} -ne 0 ] -then - echo "Download some packages failed. Please download them again." - exit 1 -fi - -# Step 2: Install the LSB Packages -echo "" -echo "Install LSB packages..." -echo "" - -# Kill lighttpd -ps aux | grep "lighttpd" | grep -v -q "grep" -if [ $? -eq 0 ] -then - killall lighttpd >/dev/null 2>&1 -fi - -# Start avahi-daemon -ps aux | grep "avahi-daemon" | grep -v -q "grep" -if [ $? -ne 0 ] -then - /etc/init.d/avahi-daemon start >/dev/null 2>&1 -fi - -LSB_START_CMD="/opt/lsb/test/manager/bin/dist-checker-start.pl" -LSB_STOP_CMD="/opt/lsb/test/manager/bin/dist-checker-stop.pl" - -PLATFORM_FILE="/etc/rpm/platform" - -RPM_INSTALL_CMD="rpm --quiet --nodeps --replacepkgs --nosignature -i --ignoreos" -RPM_INSTALL_CMD_NOSCRIPTS="rpm --quiet --nodeps --replacepkgs --noscripts --nosignature -i --ignoreos" - -# If the lsb has been started, stop it first. -if [ -x ${LSB_STOP_CMD} ] -then - ${LSB_STOP_CMD} -fi - -if [ ! -d /etc/rpm ] -then - mkdir -p /etc/rpm -fi - -if [ ! -f ${PLATFORM_FILE} ] -then - touch ${PLATFORM_FILE} -fi - -if ! `grep -F -q "noarch-suse" ${PLATFORM_FILE}`; then - if [ ${ARCH} = i686 ];then - echo "i486-suse" >> ${PLATFORM_FILE} - echo "i486-noarch" >> ${PLATFORM_FILE} - echo "i486-pc" >> ${PLATFORM_FILE} - echo "noarch-suse" >> ${PLATFORM_FILE} - elif [ ${ARCH} = x86_64 ]; then - echo "i486-suse" >> ${PLATFORM_FILE} - echo "i486-noarch" >> ${PLATFORM_FILE} - echo "i486-pc" >> ${PLATFORM_FILE} - echo "i486-.*-linux.*" >> ${PLATFORM_FILE} - echo "noarch-suse" >> ${PLATFORM_FILE} - echo "${ARCH}-suse" >> ${PLATFORM_FILE} - echo "${ARCH}-noarch" >> ${PLATFORM_FILE} - echo "${ARCH}-pc" >> ${PLATFORM_FILE} - else - echo "${ARCH}-suse" >> ${PLATFORM_FILE} - echo "${ARCH}-noarch" >> ${PLATFORM_FILE} - echo "${ARCH}-pc" >> ${PLATFORM_FILE} - echo "noarch-suse" >> ${PLATFORM_FILE} - fi -fi - -if [ -d ${BASE_PACKAGES_DIR} ] -then - cd ${BASE_PACKAGES_DIR} - for pkg in ${BASE_PACKAGES_LIST} - do - rpm --quiet -q ${pkg%\.*} - if [ $? -ne 0 ]; then - $RPM_INSTALL_CMD ${pkg} - fi - done -fi - -if [ -d ${RUNTIME_BASE_PACKAGES_DIR} ] -then - cd ${RUNTIME_BASE_PACKAGES_DIR} - for pkg in ${RUNTIME_BASE_PACKAGES_LIST} - do - rpm --quiet -q ${pkg%\.*} - if [ $? -ne 0 ]; then - $RPM_INSTALL_CMD ${pkg} - fi - done -fi - -if [ -d ${RUNTIME_PACKAGES_DIR} ] -then - cd ${RUNTIME_PACKAGES_DIR} - for pkg in ${RUNTIME_PACKAGES_LIST} - do - rpm --quiet -q ${pkg%\.*} - if [ $? -ne 0 ]; then - $RPM_INSTALL_CMD ${pkg} - fi - done -fi - -if [ -d ${APP_PACKAGES_DIR} ] -then - cd ${APP_PACKAGES_DIR} - for pkg in ${APP_PACKAGES_LIST} - do - echo "${pkg}" | grep -q "apache\|xpdf" - if [ $? -eq 0 ] - then - rpm --quiet -q ${pkg%\.*} - if [ $? -ne 0 ]; then - $RPM_INSTALL_CMD_NOSCRIPTS ${pkg} - fi - else - rpm --quiet -q ${pkg%\.*} - if [ $? -ne 0 ]; then - $RPM_INSTALL_CMD ${pkg} - fi - fi - done -fi - -if [ ! -d ${SNAPSHOTS_TESTFILES_DIR} ] -then - mkdir -p ${SNAPSHOTS_TESTFILES_DIR} -fi - -if [ -d ${APP_TESTFILES_DIR} ] -then - cd ${APP_TESTFILES_DIR} - for pkg in ${APP_TESTFILES_LIST} - do - cp -f ${pkg} ${SNAPSHOTS_TESTFILES_DIR} - done -fi - -cd ${WORK_DIR} - -# Step 3: Set environment -echo "" -echo "Set environment..." -echo "" - -check () -{ - if [ $? -eq 0 ] - then - echo "PASS" - else - echo "FAIL" - exit 1 - fi -} - -echo "" -echo "---------------------------------" -echo "Create the Dirnames on target" - -if [ ! -d /etc/rpm/sysinfo ] -then - mkdir -p /etc/rpm/sysinfo -fi - -cat > /etc/rpm/sysinfo/Dirnames << EOF -/etc/opt/lsb -/home/tet/LSB.tools -/opt/lsb-tet3-lite/lib/ksh -/opt/lsb-tet3-lite/lib/perl -/opt/lsb-tet3-lite/lib/posix_sh -/opt/lsb-tet3-lite/lib/tet3 -/opt/lsb-tet3-lite/lib/xpg3sh -/opt/lsb/appbat/lib/python2.4/site-packages/qm -/opt/lsb/appbat/lib/python2.4/site-packages/qm/external -/opt/lsb/appbat/lib/python2.4/site-packages/qm/external/DocumentTemplate -/opt/lsb/appbat/lib/python2.4/site-packages/qm/test -/opt/lsb/appbat/lib/python2.4/site-packages/qm/test/classes -/opt/lsb/appbat/lib/python2.4/site-packages/qm/test/web -/opt/lsb/test/doc -/opt/lsb/test/lib -/opt/lsb/test/qm/diagnostics -/opt/lsb/test/qm/doc -/opt/lsb/test/qm/doc/test/html -/opt/lsb/test/qm/doc/test/print -/opt/lsb/test/qm/dtml -/opt/lsb/test/qm/dtml/test -/opt/lsb/test/qm/messages/test -/opt/lsb/test/qm/tutorial/test/tdb -/opt/lsb/test/qm/tutorial/test/tdb/QMTest -/opt/lsb/test/qm/web -/opt/lsb/test/qm/web/images -/opt/lsb/test/qm/web/stylesheets -/opt/lsb/test/qm/xml -/opt/lsb/test/share -/usr/share/doc/lsb-runtime-test -/var/opt/lsb -/opt/lsb/test/desktop -/opt/lsb/test/desktop/fontconfig -/opt/lsb/test/desktop/freetype -/opt/lsb/test/desktop/gtkvts -/opt/lsb/test/desktop/libpng -/opt/lsb/test/desktop/xft -/opt/lsb/test/desktop/xml -/opt/lsb/test/desktop/xrender - - -EOF - -if [ -f /etc/rpm/sysinfo/Dirnames ] -then - echo "Success to creat Dirnames file" -else - echo "Fail to creat Dirnames file" -fi - -[ -x /sbin/ldconfig ] && { -echo "" -echo "---------------------------------" -echo "Update cache" -/sbin/ldconfig -check; -} - -# Check loop device -if [ ! -b /dev/loop0 ] -then - insmod /lib/modules/`uname -r`/kernel/drivers/block/loop.ko - if [ $? != 0 ];then - echo "Insmod loop.ko failed." - fi -fi - -# Resolve localhost -LOCALHOST=`hostname` -if ! `grep -F -q "$LOCALHOST" /etc/hosts`; then - echo "127.0.0.1 $LOCALHOST" >> /etc/hosts -fi - -# Workaround to add part of locales for LSB test -localedef -i de_DE -f ISO-8859-1 de_DE -localedef -i de_DE -f ISO-8859-15 de_DE.ISO-8859-15 -localedef -i de_DE -f UTF-8 de_DE.UTF-8 -localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro -localedef -i en_HK -f ISO-8859-1 en_HK -localedef -i en_PH -f ISO-8859-1 en_PH -localedef -i en_US -f ISO-8859-15 en_US.ISO-8859-15 -localedef -i en_US -f ISO-8859-1 en_US.ISO-8859-1 -localedef -i en_US -f ISO-8859-1 en_US -localedef -i en_US -f UTF-8 en_US.UTF-8 -localedef -i en_US -f ISO-8859-1 en_US.ISO8859-1 -localedef -i es_MX -f ISO-8859-1 es_MX -localedef -i fr_FR -f ISO-8859-1 fr_FR -localedef -i it_IT -f ISO-8859-1 it_IT -localedef -i ja_JP -f EUC-JP ja_JP.eucjp -localedef -i se_NO -f UTF-8 se_NO.UTF-8 -localedef -i ta_IN -f UTF-8 ta_IN -localedef -i es_ES -f ISO-8859-1 es_ES -localedef -i fr_FR@euro -f ISO-8859-1 fr_FR@euro -localedef -i is_IS -f UTF-8 is_IS.UTF-8 -localedef -i zh_TW -f BIG5 zh_TW.BIG5 -localedef -i en_US -f ISO-8859-15 en_US.ISO-8859-15 - -echo "" -echo "Installation done!" -echo "" - -# Step 4: Start LSB test -if [ -x ${LSB_START_CMD} ] -then - ${LSB_START_CMD} -fi - -echo "---------------------------------" -echo "Run all the certification version of LSB Tests" -echo "---------------------------------" - -LSB_DIST_CHECKER="/opt/lsb/test/manager/utils/dist-checker.pl" -SESSION="${WORK_DIR}/session" -if [ ! -e ${SESSION} ] -then - echo "Error: Could not find session file." - echo "You must run LSB test from webbrower." - exit 1 -fi - -if [ -x ${LSB_DIST_CHECKER} ] -then - ${LSB_DIST_CHECKER} -v2 -f ${SESSION} - check -fi - -echo "" -echo "LSB test complete. Please check the log file in /var/opt/lsb/test/manager/results/" -echo "" - diff --git a/poky/meta/recipes-extended/lsb/lsbtest/packages_list b/poky/meta/recipes-extended/lsb/lsbtest/packages_list deleted file mode 100644 index 1a6c11699..000000000 --- a/poky/meta/recipes-extended/lsb/lsbtest/packages_list +++ /dev/null @@ -1,49 +0,0 @@ -LSB_RELEASE="released-5.0" -LSB_ARCH="lsbarch" - -BASE_PACKAGES_LIST="lsb-setup-5.0.0-2.noarch.rpm" - -RUNTIME_BASE_PACKAGES_LIST="lsb-dist-checker-5.0.0.1-1.targetarch.rpm \ - lsb-tet3-lite-3.7-27.lsb5.targetarch.rpm \ - lsb-tet3-lite-devel-3.7-27.lsb5.targetarch.rpm \ - lsb-xvfb-1.2.0-22.targetarch.rpm \ - " - -RUNTIME_PACKAGES_LIST="lsb-cmdchk-5.0.3-1.targetarch.rpm \ - lsb-libchk-5.0.3-1.targetarch.rpm \ - lsb-qm-2.2-1.lsb5.targetarch.rpm \ - lsb-task-dist-testkit-5.0.0-2.noarch.rpm \ - lsb-test-core-5.0.1-1.targetarch.rpm \ - lsb-test-cpp-t2c-5.0.0-1.targetarch.rpm \ - lsb-test-desktop-5.0.0-1.targetarch.rpm \ - lsb-test-desktop-t2c-5.0.0-1.targetarch.rpm \ - lsb-test-libstdcpp-4.1.0-22.lsb1.targetarch.rpm \ - lsb-test-olver-core-5.0.0-1.targetarch.rpm \ - lsb-test-perl-5.0.2-1.noarch.rpm \ - lsb-test-printing-5.0.1-1.targetarch.rpm \ - lsb-test-python-5.0.0-1.targetarch.rpm \ - lsb-test-qt4-azov-5.0.0-1.targetarch.rpm \ - lsb-test-xts5-5.1.5-47.lsb5.targetarch.rpm \ - lsb-test-alsa-t2c-5.1.91-4.targetarch.rpm \ - lsb-test-core-t2c-5.0.1-1.targetarch.rpm \ - lsb-test-xml2-azov-5.0.0-1.targetarch.rpm \ - " - -APP_PACKAGES_LIST="lsb-python-2.4.6-10.lsb5.targetarch.rpm \ - lsb-apache-2.2.19-5.lsb5.targetarch.rpm \ - lsb-tcl-8.5.9-21.lsb5.targetarch.rpm \ - lsb-expect-5.43.0-21.lsb5.targetarch.rpm \ - lsb-groff-1.20.1-9.lsb5.targetarch.rpm \ - lsb-raptor-1.4.21-4.lsb5.targetarch.rpm \ - lsb-xpdf-1.01-17.lsb5.targetarch.rpm \ - lsb-samba-3.5.9-5.lsb5.targetarch.rpm \ - lsb-rsync-3.0.8-3.lsb5.targetarch.rpm \ - " - -APP_TESTFILES_LIST="expect-tests.tar \ - tcl-tests.tar \ - raptor-tests.tar \ - test1.pdf \ - test2.pdf \ - " - diff --git a/poky/meta/recipes-extended/lsb/lsbtest/session b/poky/meta/recipes-extended/lsb/lsbtest/session deleted file mode 100644 index 4d47e40f7..000000000 --- a/poky/meta/recipes-extended/lsb/lsbtest/session +++ /dev/null @@ -1,176 +0,0 @@ -[GENERAL] -VERBOSE_LEVEL: 1 -ARCHITECTURE: targetarch -USE_INTERNET: 1 -STD_VERSION: LSB 5.0 -STD_PROFILE: no -[cmdchk] -RUN: 1 -VERSION: local|* - -[libchk] -RUN: 1 -VERSION: local|* - -[alsa-t2c] -RUN: 1 -VERSION: local|* - -[alsa-t2c|local|*] -AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/alsa-t2c -AUTOREPLY_RESULTS_DIR: /opt/lsb/test/alsa-t2c/results - -[core] -RUN: 1 -VERSION: local|* - -[core|local|*] -AUTOREPLY_PROVIDES_BASH: n -AUTOREPLY_TESTRUN_PATH: /home/tet/test_sets -AUTOREPLY_PERSON: Automated -AUTOREPLY_KERNEL_NAME: vmlinuz -AUTOREPLY_INSTALL_LSBPAM_CONF: y -AUTOREPLY_PROVIDES_C_SHELL: n -AUTOREPLY_ORGANISATION: N/A -AUTOREPLY_SET_PASS_MIN_DAYS: y -AUTOREPLY_PROVIDES_SYSV_INIT: -AUTOREPLY_ISNTALL_DEVS: y -AUTOREPLY_SUPPORTS_FILE_CMD: y -AUTOREPLY_TEST_SYSTEM: Distribution Checker -AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/core/tet/test_sets -AUTOREPLY_SUPPORTS_NLS: n -AUTOREPLY_SUPPORTS_PROCESS_ACCOUNTING: n -AUTOREPLY_PATH_TO_RC.D: -AUTOREPLY_ALLOWS_MAKEDEV: n -AUTOREPLY_RESULTS_DIR: /opt/lsb/test/core/tet/test_sets/results - -[core-t2c] -RUN: 1 -VERSION: local|* - -[core-t2c|local|*] -AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/core-t2c -AUTOREPLY_RESULTS_DIR: /opt/lsb/test/core-t2c/results - -[cpp-t2c] -RUN: 1 -VERSION: local|* - -[cpp-t2c|local|*] -AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/cpp-t2c -AUTOREPLY_RESULTS_DIR: /opt/lsb/test/cpp-t2c/results - -[desktop] -RUN: 1 -VERSION: local|* - -[desktop|local|*] -AUTOREPLY_DESKTOP_ENVIRONMENT: [default] -AUTOREPLY_PERSON: Automated -AUTOREPLY_X_CLIENT_HOSTNAME: -AUTOREPLY_TEST_SYSTEM: Distribution Checker -AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/desktop -AUTOREPLY_X11_FONT_PATH: [default] -AUTOREPLY_SHOW_SUMMARY_REPORT: -AUTOREPLY_ORGANISATION: N/A -AUTOREPLY_XVFB_DISPLAY: [default] - -[desktop-t2c] -RUN: 1 -VERSION: local|* - -[desktop-t2c|local|*] -AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/desktop-t2c -AUTOREPLY_RESULTS_DIR: /opt/lsb/test/desktop-t2c/results - -[libstdcpp] -RUN: 1 -VERSION: local|* - -[libstdcpp|local|*] -AUTOREPLY_TEST_SYSTEM: Distribution Checker -AUTOREPLY_PERSON: Automated -AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/libstdcpp_4.1.0 -AUTOREPLY_ORGANISATION: N/A -AUTOREPLY_GNU_TRIPLET: - -[olver] -RUN: 1 -VERSION: local|* - -[olver|local|*] -AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/olver-core -AUTOREPLY_RESULTS_DIR: /var/opt/lsb/test/olver-core - -[perl] -RUN: 1 -VERSION: local|* - -[perl|local|*] -AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/perl -AUTOREPLY_RESULTS_DIR: /opt/lsb/test/perl/results - -[printing] -RUN: 1 -VERSION: local|* - -[printing|local|*] -AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/printing -AUTOREPLY_RESULTS_DIR: /opt/lsb/test/printing/results - -[python] -RUN: 1 -VERSION: local|* - -[python|local|*] -AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/python -AUTOREPLY_RESULTS_DIR: /opt/lsb/test/python/results - -[xml2-azov] -RUN: 1 -VERSION: local|* - -[xts5] -RUN: 1 -VERSION: local|* - -[xts5|local|*] -AUTOREPLY_XT_FONTPATH_GOOD: [default] -AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/xts5 -AUTOREPLY_XVFB_DISPLAY: [default] -AUTOREPLY_RESULTS_DIR: /opt/lsb/test/xts5/xts5/results -AUTOREPLY_XT_FONTPATH: [default] -AUTOREPLY_X_CLIENT_HOSTNAME: - -[apache] -RUN: 1 -VERSION: local|* - -[expect] -RUN: 1 -VERSION: local|* - -[groff] -RUN: 1 -VERSION: local|* - -[raptor] -RUN: 1 -VERSION: local|* - -[rsync] -RUN: 1 -VERSION: local|* - -[samba] -RUN: 1 -VERSION: local|* - -[tcl] -RUN: 1 -VERSION: local|* - -[xpdf] -RUN: 1 -VERSION: local|* - diff --git a/poky/meta/recipes-extended/lsb/lsbtest_1.0.bb b/poky/meta/recipes-extended/lsb/lsbtest_1.0.bb deleted file mode 100644 index a90c023d5..000000000 --- a/poky/meta/recipes-extended/lsb/lsbtest_1.0.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "Automates Linux Standard Base (LSB) tests" -HOMEPAGE = "https://wiki.debian.org/LSBInitScripts" -SECTION = "console/utils" -LICENSE = "GPLv2" -PR = "r3" - -LIC_FILES_CHKSUM = "file://LSB_Test.sh;beginline=3;endline=16;md5=7063bb54b04719df0716b513447f4fc0" - -SRC_URI = "file://LSB_Test.sh \ - file://packages_list \ - file://session \ - " -RDEPENDS_${PN} = "lsb rpm" - -S = "${WORKDIR}" - -do_install() { - install -d ${D}/opt/lsb-test - install -m 0755 ${S}/LSB_Test.sh ${D}/opt/lsb-test/LSB_Test.sh - install -m 0644 ${S}/packages_list ${D}/opt/lsb-test/packages_list - install -m 0644 ${S}/session ${D}/opt/lsb-test/session - if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ];then - sed -i -e 's/lsbarch/ia32/g' -e 's/targetarch/i486/g' ${D}/opt/lsb-test/packages_list - sed -i -e 's/targetarch/x86/g' ${D}/opt/lsb-test/session - fi - if [ "${TARGET_ARCH}" = "x86_64" ];then - sed -i -e 's/lsbarch/amd64/g' -e 's/targetarch/x86_64/g' ${D}/opt/lsb-test/packages_list - sed -i -e 's/targetarch/x86-64/g' ${D}/opt/lsb-test/session - fi - if [ "${TARGET_ARCH}" = "powerpc" ];then - sed -i -e 's/lsbarch/ppc32/g' -e 's/targetarch/ppc/g' ${D}/opt/lsb-test/packages_list - sed -i -e 's/targetarch/PPC32/g' ${D}/opt/lsb-test/session - fi - - # For a ppc64 target. the default userspace is 32b. - # Therefore, only change the lsbarch and targetarch - # in the package_list when MLIB=lib64 is being used. - # Otherwise, by default, the ppc32 LSB packages - # will be downloaded by LSB_Test.sh - if [ "${TARGET_ARCH}" = "powerpc64" ];then - if [ "${PN}" != "${BPN}" ];then - sed -i -e 's/lsbarch/ppc64/g' -e 's/targetarch/ppc64/g' ${D}/opt/lsb-test/packages_list - sed -i -e 's/targetarch/PPC64/g' ${D}/opt/lsb-test/session - fi - fi -} - -FILES_${PN} += "/opt/lsb-test/* \ - " diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch b/poky/meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch new file mode 100644 index 000000000..94f6f5a15 --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch @@ -0,0 +1,81 @@ +From fbeda82f440a0098be42dd668cbc47212a86ab48 Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Wed, 21 Aug 2019 16:27:24 +0800 +Subject: [PATCH] cve/meltdown.c: Fix kernel symbol finding + +meltdown case fails as below. +safe_file_ops.c:219: BROK: Expected 3 conversions got 2 at meltdown.c:272 + +find_kernel_symbol is defined to try twice with each of /proc/kallsyms and +/boot/System.map-%s. Currently if the symbol is not found in /proc/kallsyms, +when kernel option CONFIG_KALLSYMS_ALL is disabled, it would stop the case +immediately due to SAFE_FILE_LINES_SCANF. + +This patch turns to use FILE_LINES_SCANF to give find_kernel_symbol second +chance. + +[jstancek] Fix also condition introduced in 7709d2ae92ea, even if + /proc/kallsyms is disabled, we still want to try System.map. + +Signed-off-by: He Zhe <zhe.he@windriver.com> +Signed-off-by: Jan Stancek <jstancek@redhat.com> + +Upstream-Status: Backport +[https://github.com/linux-test-project/ltp/commit/c2049b5c874bc071f8185bffb5fd7dcb042d9ec8] + +Remove the hunk for upstream 7709d2ae92ea ("cve/meltdown.c: abort the test if kallsyms was not enabled") +that has been covered by this patch. + +Signed-off-by: He Zhe <zhe.he@windriver.com> +--- + testcases/cve/meltdown.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/testcases/cve/meltdown.c b/testcases/cve/meltdown.c +index a53ea9b..22651a6 100644 +--- a/testcases/cve/meltdown.c ++++ b/testcases/cve/meltdown.c +@@ -267,9 +267,15 @@ find_symbol_in_file(const char *filename, const char *symname) + int ret, read; + char fmt[strlen(symname) + 64]; + ++ tst_res(TINFO, "Looking for %s in %s", symname, filename); ++ if (access(filename, F_OK) == -1) { ++ tst_res(TINFO, "%s not available", filename); ++ return 0; ++ } ++ + sprintf(fmt, "%%lx %%c %s%%c", symname); + +- ret = SAFE_FILE_LINES_SCANF(filename, fmt, &addr, &type, &read); ++ ret = FILE_LINES_SCANF(filename, fmt, &addr, &type, &read); + if (ret) + return 0; + +@@ -287,13 +293,11 @@ find_kernel_symbol(const char *name) + if (addr) + return addr; + +- tst_res(TINFO, "not found '%s' in /proc/kallsyms", name); + if (uname(&utsname) < 0) + tst_brk(TBROK | TERRNO, "uname"); + + sprintf(systemmap, "/boot/System.map-%s", utsname.release); + +- tst_res(TINFO, "looking in '%s'\n", systemmap); + addr = find_symbol_in_file(systemmap, name); + return addr; + } +@@ -308,6 +312,9 @@ static void setup(void) + saved_cmdline_addr = find_kernel_symbol("saved_command_line"); + tst_res(TINFO, "&saved_command_line == 0x%lx", saved_cmdline_addr); + ++ if (!saved_cmdline_addr) ++ tst_brk(TCONF, "saved_command_line not found"); ++ + spec_fd = SAFE_OPEN("/proc/cmdline", O_RDONLY); + + memset(target_array, 1, sizeof(target_array)); +-- +2.7.4 + diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch b/poky/meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch new file mode 100644 index 000000000..0e56c0825 --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch @@ -0,0 +1,46 @@ +From a5046625eaeed2d3fba456c3ba84c6c141c2ad7c Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Thu, 29 Aug 2019 21:09:46 +0800 +Subject: [PATCH] syscall/rt_sigtimedwait01: Fix wrong sigset length for MIPS + +rt_sigtimedwait01 fails as follow on MIPS arches +rt_sigtimedwait01 1 TFAIL : .../sigwaitinfo01.c:58: test_empty_set +(.../sigwaitinfo01.c: 148): Unexpected failure: +TEST_ERRNO=EINVAL(22): Invalid argument + +As this case purposely bypasses glibc, it should align with the size of kernel +definition of sigset_t which is different from other arches. +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/mips/include/uapi/asm/signal.h#n15 + +This patch turns to use _NSIG which is always right for all arches. + +Upstream-Status: Backport [a5046625eaeed2d3fba456c3ba84c6c141c2ad7c] + +Suggested-by: Jan Stancek <jstancek@redhat.com> +Acked-by: Jan Stancek <jstancek@redhat.com> +Acked-by: Cyril Hrubis <chrubis@suse.cz> +Signed-off-by: He Zhe <zhe.he@windriver.com> +Signed-off-by: Petr Vorel <pvorel@suse.cz> +--- + testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c +index 5a32ce1..6a30c27 100644 +--- a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c ++++ b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c +@@ -128,9 +128,8 @@ static int my_sigtimedwait(const sigset_t * set, siginfo_t * info, + static int my_rt_sigtimedwait(const sigset_t * set, siginfo_t * info, + struct timespec *timeout) + { +- +- /* The last argument is (number_of_signals)/(bits_per_byte), which are 64 and 8, resp. */ +- return ltp_syscall(__NR_rt_sigtimedwait, set, info, timeout, 8); ++ /* _NSIG is always the right number of bits of signal map for all arches */ ++ return ltp_syscall(__NR_rt_sigtimedwait, set, info, timeout, _NSIG/8); + } + #endif + +-- +2.7.4 + diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch b/poky/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch new file mode 100644 index 000000000..f4f87f38a --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch @@ -0,0 +1,161 @@ +From 0463d793566772a606255957915f99d166d5740c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 28 Aug 2019 18:30:23 +0200 +Subject: [PATCH] testcases: use python3 everywhere to run python scripts + +The scripts themselves have #!/usr/bin/python3 in them, +so I trust they are already py3-compatible. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + testcases/kernel/power_management/runpwtests05.sh | 2 +- + .../power_management/runpwtests_exclusive01.sh | 2 +- + .../power_management/runpwtests_exclusive02.sh | 2 +- + .../power_management/runpwtests_exclusive03.sh | 2 +- + .../power_management/runpwtests_exclusive04.sh | 2 +- + .../power_management/runpwtests_exclusive05.sh | 2 +- + testcases/network/nfsv4/acl/runtest | 14 +++++++------- + testcases/realtime/func/pi-tests/run_auto.sh | 6 +++--- + 8 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/testcases/kernel/power_management/runpwtests05.sh b/testcases/kernel/power_management/runpwtests05.sh +index 8a7d0f6e0..43e234d01 100755 +--- a/testcases/kernel/power_management/runpwtests05.sh ++++ b/testcases/kernel/power_management/runpwtests05.sh +@@ -35,7 +35,7 @@ else + max_sched_smt=1 + fi + +-tst_test_cmds python ++tst_test_cmds python3 + + if ! grep sched_debug -qw /proc/cmdline ; then + tst_brkm TCONF "Kernel cmdline parameter 'sched_debug' needed," \ +diff --git a/testcases/kernel/power_management/runpwtests_exclusive01.sh b/testcases/kernel/power_management/runpwtests_exclusive01.sh +index ec78319e2..9fefcbf6e 100755 +--- a/testcases/kernel/power_management/runpwtests_exclusive01.sh ++++ b/testcases/kernel/power_management/runpwtests_exclusive01.sh +@@ -35,7 +35,7 @@ else + max_sched_smt=1 + fi + +-tst_test_cmds python ++tst_test_cmds python3 + + hyper_threaded=$(is_hyper_threaded) + multi_socket=$(is_multi_socket) +diff --git a/testcases/kernel/power_management/runpwtests_exclusive02.sh b/testcases/kernel/power_management/runpwtests_exclusive02.sh +index e107fce35..2cd0ecb05 100755 +--- a/testcases/kernel/power_management/runpwtests_exclusive02.sh ++++ b/testcases/kernel/power_management/runpwtests_exclusive02.sh +@@ -33,7 +33,7 @@ else + max_sched_smt=1 + fi + +-tst_test_cmds python ++tst_test_cmds python3 + + hyper_threaded=$(is_hyper_threaded) + multi_socket=$(is_multi_socket) +diff --git a/testcases/kernel/power_management/runpwtests_exclusive03.sh b/testcases/kernel/power_management/runpwtests_exclusive03.sh +index 490344bb3..ab3a5d11d 100755 +--- a/testcases/kernel/power_management/runpwtests_exclusive03.sh ++++ b/testcases/kernel/power_management/runpwtests_exclusive03.sh +@@ -35,7 +35,7 @@ else + max_sched_smt=1 + fi + +-tst_test_cmds python ++tst_test_cmds python3 + + hyper_threaded=$(is_hyper_threaded) + multi_socket=$(is_multi_socket) +diff --git a/testcases/kernel/power_management/runpwtests_exclusive04.sh b/testcases/kernel/power_management/runpwtests_exclusive04.sh +index 978ca02ae..438ef603f 100755 +--- a/testcases/kernel/power_management/runpwtests_exclusive04.sh ++++ b/testcases/kernel/power_management/runpwtests_exclusive04.sh +@@ -27,7 +27,7 @@ export TST_TOTAL=2 + # Checking test environment + check_kervel_arch + +-tst_test_cmds python ++tst_test_cmds python3 + + hyper_threaded=$(is_hyper_threaded) + multi_socket=$(is_multi_socket) +diff --git a/testcases/kernel/power_management/runpwtests_exclusive05.sh b/testcases/kernel/power_management/runpwtests_exclusive05.sh +index a0dad5834..3a9afdbf2 100755 +--- a/testcases/kernel/power_management/runpwtests_exclusive05.sh ++++ b/testcases/kernel/power_management/runpwtests_exclusive05.sh +@@ -35,7 +35,7 @@ else + max_sched_smt=1 + fi + +-tst_test_cmds python ++tst_test_cmds python3 + + hyper_threaded=$(is_hyper_threaded) + multi_socket=$(is_multi_socket) +diff --git a/testcases/network/nfsv4/acl/runtest b/testcases/network/nfsv4/acl/runtest +index d2e1b4c49..a859e85bc 100755 +--- a/testcases/network/nfsv4/acl/runtest ++++ b/testcases/network/nfsv4/acl/runtest +@@ -22,7 +22,7 @@ do + done + + # creation of users on the remote machine (removed only at the end of the tests) +-rsh -n $REMOTEHOST python $PWD/create_users.py -u 50 -g 50 ++rsh -n $REMOTEHOST python3 $PWD/create_users.py -u 50 -g 50 + + echo "Starting ACL testing" + +@@ -51,19 +51,19 @@ echo "Basic tests finished" + + echo "LONG ACL TEST" + echo "creating necessary users and groups" +-python create_users.py -u 50 -g 50 ++python3 create_users.py -u 50 -g 50 + echo "creating necessary users and groups on the remote host" + mkdir $NFSMNTDIR/lacl-testdir +-python test_long_acl.py -l $MAXLENGTH -p $NFSMNTDIR/lacl-testdir ++python3 test_long_acl.py -l $MAXLENGTH -p $NFSMNTDIR/lacl-testdir + rm -rf $NFSMNTDIR/lacl-testdir + echo "Long ACL test OK with $MAXLENGTH entries" + echo "ACL STRESSING TEST" +-python setacl_stress.py -n 100 -u $USER_NB -g $GRP_NB -f $FILE_NB -p $NFSMNTDIR ++python3 setacl_stress.py -n 100 -u $USER_NB -g $GRP_NB -f $FILE_NB -p $NFSMNTDIR + + # remove local an remote users +-python cleanusers.py +-python cleangroups.py +-rsh -n $REMOTEHOST python $PWD/cleanusers.py ++python3 cleanusers.py ++python3 cleangroups.py ++rsh -n $REMOTEHOST python3 $PWD/cleanusers.py + + echo "Test OK" + +diff --git a/testcases/realtime/func/pi-tests/run_auto.sh b/testcases/realtime/func/pi-tests/run_auto.sh +index d13026049..277988568 100755 +--- a/testcases/realtime/func/pi-tests/run_auto.sh ++++ b/testcases/realtime/func/pi-tests/run_auto.sh +@@ -15,15 +15,15 @@ $SCRIPTS_DIR/run_c_files.sh $profile testpi-0 + + export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-1.log" + $SCRIPTS_DIR/run_c_files.sh $profile testpi-1 +-PYTHONPATH=../../ python parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE ++PYTHONPATH=../../ python3 parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE + + export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-2.log" + $SCRIPTS_DIR/run_c_files.sh $profile testpi-2 +-PYTHONPATH=../../ python parse-testpi2.py $LOG_FILE 2>&1 | tee -a $LOG_FILE ++PYTHONPATH=../../ python3 parse-testpi2.py $LOG_FILE 2>&1 | tee -a $LOG_FILE + + export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-4.log" + $SCRIPTS_DIR/run_c_files.sh $profile testpi-4 +-PYTHONPATH=../../ python parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE ++PYTHONPATH=../../ python3 parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE + + + export LOG_FILE="" diff --git a/poky/meta/recipes-extended/ltp/ltp_20190517.bb b/poky/meta/recipes-extended/ltp/ltp_20190517.bb index b0e2f969c..e9a588f49 100644 --- a/poky/meta/recipes-extended/ltp/ltp_20190517.bb +++ b/poky/meta/recipes-extended/ltp/ltp_20190517.bb @@ -45,6 +45,9 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0002-check-for-RES_USE_INET6-during-configure.patch \ file://0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch \ file://0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch \ + file://0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch \ + file://0001-testcases-use-python3-everywhere-to-run-python-scrip.patch \ + file://0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch \ " S = "${WORKDIR}/git" @@ -96,7 +99,7 @@ RDEPENDS_${PN} = "\ libaio \ logrotate \ perl \ - python-core \ + python3-core \ procps \ quota \ unzip \ diff --git a/poky/meta/recipes-extended/man-db/man-db_2.8.6.1.bb b/poky/meta/recipes-extended/man-db/man-db_2.8.7.bb index ec9eb8385..083b2374a 100644 --- a/poky/meta/recipes-extended/man-db/man-db_2.8.6.1.bb +++ b/poky/meta/recipes-extended/man-db/man-db_2.8.7.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ file://99_mandb \ file://man_db.conf-avoid-multilib-install-file-conflict.patch" -SRC_URI[md5sum] = "22e82fe1127f4ca95de7100168a927d1" -SRC_URI[sha256sum] = "2c77a2bb9dbf06f72417a6f63063e204888a22a5020ff77334d304d55f813a28" +SRC_URI[md5sum] = "ec0b23c8314a1654c4d059b2c18ce43d" +SRC_URI[sha256sum] = "b9cd5bb996305d08bfe9e1114edc30b4c97be807093b88af8033ed1cf9beb326" DEPENDS = "libpipeline gdbm groff-native base-passwd" RDEPENDS_${PN} += "base-passwd" @@ -18,7 +18,7 @@ USE_NLS_libc-musl = "no" inherit gettext pkgconfig autotools systemd -EXTRA_OECONF = "--with-pager=less" +EXTRA_OECONF = "--with-pager=less --with-systemdsystemunitdir=${systemd_unitdir}/system" EXTRA_AUTORECONF += "-I ${S}/gl/m4" do_install() { diff --git a/poky/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch b/poky/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch new file mode 100644 index 000000000..3a192cc95 --- /dev/null +++ b/poky/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch @@ -0,0 +1,43 @@ +From 1b83afa7c3121f819e72ea74883f8b6d61d6548e Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Fri, 6 Sep 2019 10:59:02 +0800 +Subject: [PATCH] mdadm: skip test 11spare-migration + +11spare-migration is a test series to check mdadm Monitor migrates spares +according to rules in /etc/mdadm.conf defined by POLICY lines. + +[snip] +for scan in no yes; do + for platform in 1.2 imsm; do + try + done +done +[snip] + +"try" includes near 20 sub testcase, so there are nearly 80 subcases need to run, +so it will take long time than ptest-runner timeout limit, skip it as workaround. + +Upstream-Status: Inappropriate[oe-specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + test | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/test b/test +index 711a3c7..880dd1d 100755 +--- a/test ++++ b/test +@@ -272,6 +272,9 @@ main() { + else + for script in $testdir/$prefix $testdir/$prefix*[^~] + do ++ if [ $script == "$testdir/11spare-migration" ];then ++ continue ++ fi + do_test $script + done + fi +-- +2.7.4 + diff --git a/poky/meta/recipes-extended/mdadm/mdadm_4.1.bb b/poky/meta/recipes-extended/mdadm/mdadm_4.1.bb index 74c94f6ec..639382e13 100644 --- a/poky/meta/recipes-extended/mdadm/mdadm_4.1.bb +++ b/poky/meta/recipes-extended/mdadm/mdadm_4.1.bb @@ -22,7 +22,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://mdadm.init \ file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \ file://include_sysmacros.patch \ + file://0001-mdadm-skip-test-11spare-migration.patch \ " + SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598" SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a" diff --git a/poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb deleted file mode 100644 index a821fd8bf..000000000 --- a/poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ /dev/null @@ -1,240 +0,0 @@ -# -# Copyright (C) 2010 Intel Corporation -# - -SUMMARY = "Linux Standard Base (LSB)" -DESCRIPTION = "Packages required to satisfy the Linux Standard Base (LSB) specification" -PR = "r10" - -inherit packagegroup distro_features_check - -# The libxt, libxtst and others require x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" - -# libglu needs virtual/libgl, which requires opengl in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES += "opengl" - -# libpam, pam-plugin-wheel requires pam in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES += "pam" - -# -# We will skip parsing this packagegeoup for non-glibc systems -# -python __anonymous () { - if d.getVar('TCLIBC') != "glibc": - raise bb.parse.SkipRecipe("incompatible with %s C library" % - d.getVar('TCLIBC')) -} - -PACKAGES = "\ - packagegroup-core-lsb \ - packagegroup-core-sys-extended \ - packagegroup-core-db \ - packagegroup-core-perl \ - packagegroup-core-python \ - packagegroup-core-tcl \ - packagegroup-core-lsb-misc \ - packagegroup-core-lsb-core \ - packagegroup-core-lsb-perl \ - packagegroup-core-lsb-python \ - packagegroup-core-lsb-desktop \ - packagegroup-core-lsb-runtime-add \ - " - - -RDEPENDS_packagegroup-core-lsb = "\ - packagegroup-core-sys-extended \ - packagegroup-core-db \ - packagegroup-core-perl \ - packagegroup-core-python \ - packagegroup-core-tcl \ - packagegroup-core-lsb-misc \ - packagegroup-core-lsb-core \ - packagegroup-core-lsb-perl \ - packagegroup-core-lsb-python \ - packagegroup-core-lsb-desktop \ - packagegroup-core-lsb-runtime-add \ - " - - -RDEPENDS_packagegroup-core-sys-extended = "\ - curl \ - dhcp-client \ - hdparm \ - lighttpd \ - libaio \ - lrzsz \ - lzo \ - mc \ - mc-fish \ - mc-helpers \ - mc-helpers-perl \ - mdadm \ - minicom \ - parted \ - quota \ - screen \ - setserial \ - sysstat \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'udev-extraconf', d)} \ - unzip \ - watchdog \ - wget \ - which \ - xinetd \ - zip \ - " - -RDEPENDS_packagegroup-core-db = "\ - db \ - sqlite3 \ - " - -RDEPENDS_packagegroup-core-perl = "\ - gdbm \ - perl \ - zlib \ - " - - -RDEPENDS_packagegroup-core-python = "\ - expat \ - gdbm \ - gmp \ - ncurses \ - openssl \ - python \ - readline \ - zip \ - " - -RDEPENDS_packagegroup-core-tcl = "\ - tcl \ - " - -# Miscellaneous packages required by LSB (or LSB tests) -RDEPENDS_packagegroup-core-lsb-misc = "\ - chkconfig \ - gettext \ - gettext-runtime \ - groff \ - lsbinitscripts \ - lsbtest \ - lsof \ - strace \ - libusb1 \ - usbutils \ - rpm \ - " - -SUMMARY_packagegroup-core-lsb-core = "LSB Core" -DESCRIPTION_packagegroup-core-lsb-core = "Packages required to support commands/libraries \ - specified in the LSB Core specification" -RDEPENDS_packagegroup-core-lsb-core = "\ - at \ - bash \ - bc \ - binutils \ - binutils-symlinks \ - bzip2 \ - coreutils \ - cpio \ - cronie \ - cups \ - diffutils \ - ed \ - glibc-utils \ - elfutils \ - file \ - findutils \ - fontconfig-utils \ - foomatic-filters \ - gawk \ - ghostscript \ - grep \ - gzip \ - localedef \ - lsb \ - m4 \ - make \ - man \ - man-pages \ - msmtp \ - patch \ - procps \ - psmisc \ - sed \ - shadow \ - tar \ - time \ - util-linux \ - xdg-utils \ - \ - glibc \ - libgcc \ - libpam \ - libxml2 \ - ncurses \ - zlib \ - nspr \ - nss \ -" - -SUMMARY_packagegroup-core-lsb-perl = "LSB Runtime Languages (Perl)" -DESCRIPTION_packagegroup-core-lsb-perl = "Packages required to support libraries \ - specified in the LSB Runtime languages specification (Perl parts)" -RDEPENDS_packagegroup-core-lsb-perl = "\ - perl \ - perl-modules \ - perl-misc \ - perl-pod \ - perl-dev \ - perl-doc \ -" - -SUMMARY_packagegroup-core-lsb-python = "LSB Runtime Languages (Python)" -DESCRIPTION_packagegroup-core-lsb-python = "Packages required to support libraries \ - specified in the LSB Runtime languages specification (Python parts)" -RDEPENDS_packagegroup-core-lsb-python = "\ - python \ - python-modules \ - python-misc \ -" - -SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop" -DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to support libraries \ - specified in the LSB Desktop specification" -RDEPENDS_packagegroup-core-lsb-desktop = "\ - libxt \ - libxxf86vm \ - libdrm \ - libglu \ - libxi \ - libxtst \ - libx11-locale \ - xorg-minimal-fonts \ - gdk-pixbuf-loader-ico \ - gdk-pixbuf-loader-bmp \ - gdk-pixbuf-loader-ani \ - gdk-pixbuf-xlib \ - liberation-fonts \ - alsa-lib \ -" - -RDEPENDS_packagegroup-core-lsb-runtime-add = "\ - ldd \ - pam-plugin-wheel \ - e2fsprogs-mke2fs \ - mkfontdir \ - liburi-perl \ - libxml-parser-perl \ - libxml-perl \ - libxml-sax-perl \ - glibc-localedatas \ - glibc-gconvs \ - glibc-charmaps \ - glibc-binaries \ - glibc-localedata-posix \ - glibc-extra-nss \ - glibc-pcprofile \ -" diff --git a/poky/meta/recipes-extended/sysstat/sysstat.inc b/poky/meta/recipes-extended/sysstat/sysstat.inc index 592cbf457..5a7d2114c 100644 --- a/poky/meta/recipes-extended/sysstat/sysstat.inc +++ b/poky/meta/recipes-extended/sysstat/sysstat.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/" LICENSE = "GPLv2+" SECTION = "console/utils" -SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.xz \ +SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/${BP}.tar.xz \ file://99_sysstat \ file://sysstat.service \ " @@ -29,7 +29,7 @@ SYSTEMD_SERVICE_${PN} = "sysstat.service" SYSTEMD_AUTO_ENABLE = "enable" do_configure_prepend() { - export sa_lib_dir=${libdir}/sa + export sa_lib_dir=${libexecdir}/sa } do_install() { diff --git a/poky/meta/recipes-extended/sysstat/sysstat_12.1.3.bb b/poky/meta/recipes-extended/sysstat/sysstat_12.1.6.bb index 5daf3f45f..8cf8c36d9 100644 --- a/poky/meta/recipes-extended/sysstat/sysstat_12.1.3.bb +++ b/poky/meta/recipes-extended/sysstat/sysstat_12.1.6.bb @@ -4,5 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" SRC_URI += "file://0001-Include-needed-headers-explicitly.patch" -SRC_URI[md5sum] = "0f9b73f60aba6fd49de346bc384902c3" -SRC_URI[sha256sum] = "55498bf82755ba9fed3e7df61fd26f8f50dd3e7b3b229c731029a4c8ab51a1aa" +SRC_URI[md5sum] = "d8e3bbb9c873dd370f6d33664e326570" +SRC_URI[sha256sum] = "f752f3c406153a6fc446496f1102872505ace3f0931d975c1d664c81ec09f129" diff --git a/poky/meta/recipes-extended/texinfo/texinfo_6.5.bb b/poky/meta/recipes-extended/texinfo/texinfo_6.5.bb index f966457f8..50eae77ad 100644 --- a/poky/meta/recipes-extended/texinfo/texinfo_6.5.bb +++ b/poky/meta/recipes-extended/texinfo/texinfo_6.5.bb @@ -42,7 +42,9 @@ SRC_URI[sha256sum] = "d34272e4042c46186ddcd66bd5d980c0ca14ff734444686ccf8131f6ec tex_texinfo = "texmf/tex/texinfo" -inherit gettext autotools +inherit gettext autotools multilib_script + +MULTILIB_SCRIPTS = "${PN}:${bindir}/texi2any" EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" diff --git a/poky/meta/recipes-gnome/libsecret/libsecret_0.18.8.bb b/poky/meta/recipes-gnome/libsecret/libsecret_0.19.0.bb index 4af47fede..7da8e9008 100644 --- a/poky/meta/recipes-gnome/libsecret/libsecret_0.18.8.bb +++ b/poky/meta/recipes-gnome/libsecret/libsecret_0.19.0.bb @@ -8,8 +8,8 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native" PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" -SRC_URI[archive.md5sum] = "fee403988442f497f3c1dfe7b128869c" -SRC_URI[archive.sha256sum] = "3bfa889d260e0dbabcf5b9967f2aae12edcd2ddc9adc365de7a5cc840c311d15" +SRC_URI[archive.md5sum] = "483d293e73e7257c6d9fc18579b0e1ea" +SRC_URI[archive.sha256sum] = "8049b09a4e737911aa647e50aee3d06b5db7aa902608ca43a0dd10d83e1d67f9" # http://errors.yoctoproject.org/Errors/Details/20228/ ARM_INSTRUCTION_SET_armv4 = "arm" diff --git a/poky/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb b/poky/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb deleted file mode 100644 index cccdd2073..000000000 --- a/poky/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -EGLINFO_PLATFORM ?= "fb" -EGLINFO_BINARY_NAME ?= "eglinfo-fb" - -require eglinfo.inc - -SUMMARY += "(Framebuffer version)" -CXXFLAGS += "-DMESA_EGL_NO_X11_HEADERS=1" diff --git a/poky/meta/recipes-graphics/eglinfo/eglinfo-wayland_1.0.0.bb b/poky/meta/recipes-graphics/eglinfo/eglinfo-wayland_1.0.0.bb deleted file mode 100644 index 87a131aa7..000000000 --- a/poky/meta/recipes-graphics/eglinfo/eglinfo-wayland_1.0.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -EGLINFO_PLATFORM ?= "wayland" -EGLINFO_BINARY_NAME ?= "eglinfo-wayland" - -require eglinfo.inc - -DEPENDS += "wayland" - -inherit distro_features_check - -# depends on wayland -REQUIRED_DISTRO_FEATURES += "wayland" - -SUMMARY += "(Wayland version)" diff --git a/poky/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb b/poky/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb deleted file mode 100644 index 48ab8805d..000000000 --- a/poky/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -EGLINFO_PLATFORM ?= "x11" -EGLINFO_BINARY_NAME ?= "eglinfo-x11" - -require eglinfo.inc - -DEPENDS += "virtual/libx11" - -inherit distro_features_check - -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES += "x11" - -SUMMARY += "(X11 version)" diff --git a/poky/meta/recipes-graphics/eglinfo/eglinfo.inc b/poky/meta/recipes-graphics/eglinfo/eglinfo.inc deleted file mode 100644 index 6dcb0c5a1..000000000 --- a/poky/meta/recipes-graphics/eglinfo/eglinfo.inc +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Utility for printing information EGL and its client APIs (OpenGL, OpenGL ES, OpenVG)" -SECTION = "graphics" -LICENSE = "Zlib" -HOMEPAGE = "https://github.com/dv1/eglinfo" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8d4f33bc3add976f7dfae85dab66f03c" - -DEPENDS = "virtual/egl" - -SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master \ - file://waf \ - file://0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch \ - file://0001-Check-for-libegl-using-pkg-config.patch \ - " -SRCREV = "223817ee37988042db7873cfb5b2e899dfe35c10" - -CVE_PRODUCT = "eglinfo" - -S = "${WORKDIR}/git" - -inherit waf distro_features_check pkgconfig -# depends on virtual/egl -REQUIRED_DISTRO_FEATURES ?= "opengl" - -# BSP layers should add .bbappend files for the -x11 and -fb .bb recipes, which -# append the respective EGL/OpenGLES/OpenVG libraries to DEPENDS and set -# EGL_DEVICE as appropriate. -EGLINFO_DEVICE ?= "generic" - -EXTRA_OECONF = "--platform=${EGLINFO_PLATFORM} \ - --device=${EGLINFO_DEVICE} \ - --sysroot ${STAGING_DIR_TARGET}" - -do_configure_prepend() { - install -D -m 0755 ${WORKDIR}/waf ${S}/waf -} -do_install_append() { - mv ${D}/${bindir}/eglinfo ${D}/${bindir}/${EGLINFO_BINARY_NAME} -} diff --git a/poky/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch b/poky/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch deleted file mode 100644 index 61327eb36..000000000 --- a/poky/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 99a5784d33ad5e0e6fa00338d2732cbccad7661c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 13 Jan 2016 16:08:22 -0800 -Subject: [PATCH] Add STAGING_INCDIR to searchpath for egl headers - -bcm_host.h is in standard includedir in sysroot -add that to header search paths. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - wscript | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/wscript b/wscript -index 195e247..0f6ec53 100644 ---- a/wscript -+++ b/wscript -@@ -177,9 +177,10 @@ def configure_raspberrypi_device(conf, platform): - conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL') - import os - sysroot = conf.options.sysroot + conf.options.prefix -+ std_include_path = os.path.join(sysroot, 'include') - vcos_pthread_path = os.path.join(sysroot, 'include/interface/vcos/pthreads') - vcms_host_path = os.path.join(sysroot, 'include/interface/vmcs_host/linux') -- if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path], uselib_store = 'EGL'): -+ if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path, std_include_path], uselib_store = 'EGL'): - conf.fatal('Check if --prefix and --sysroot are set correctly.') - conf.env['WITH_APIS'] = [] - if check_gles2(conf): --- -2.19.1 diff --git a/poky/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch b/poky/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch deleted file mode 100644 index 572c8014c..000000000 --- a/poky/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 17f5d2f574236f8c3459f9efadef2f0f6220a4dd Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 13 Aug 2018 15:46:53 -0700 -Subject: [PATCH] Check for libegl using pkg-config - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -[Roman: patch has been rebased to 223817ee3798 ("Add Wayland support") - trivial merge conflicts resolved] -Signed-off-by: Roman Stratiienko <roman.stratiienko@globallogic.com> ---- - wscript | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/wscript b/wscript -index 0f6ec53..401f62e 100644 ---- a/wscript -+++ b/wscript -@@ -174,14 +174,9 @@ def configure_raspberrypi_device(conf, platform): - else: - conf.fatal('Unsupported Raspberry Pi platform "%s"' % platform) - return -- conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL') -+ conf.check_cfg(package='egl', args='--libs --cflags') - import os - sysroot = conf.options.sysroot + conf.options.prefix -- std_include_path = os.path.join(sysroot, 'include') -- vcos_pthread_path = os.path.join(sysroot, 'include/interface/vcos/pthreads') -- vcms_host_path = os.path.join(sysroot, 'include/interface/vmcs_host/linux') -- if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path, std_include_path], uselib_store = 'EGL'): -- conf.fatal('Check if --prefix and --sysroot are set correctly.') - conf.env['WITH_APIS'] = [] - if check_gles2(conf): - conf.env['WITH_APIS'] += ['GLES1', 'GLES2'] --- -2.19.1 diff --git a/poky/meta/recipes-graphics/eglinfo/files/waf b/poky/meta/recipes-graphics/eglinfo/files/waf deleted file mode 100755 index 04ddd9f63..000000000 --- a/poky/meta/recipes-graphics/eglinfo/files/waf +++ /dev/null @@ -1,169 +0,0 @@ -#!/usr/bin/env python -# encoding: latin-1 -# Thomas Nagy, 2005-2018 -# -""" -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. -""" - -import os, sys, inspect - -VERSION="2.0.11" -REVISION="41b69b45f8aa445dce066a4aec3cdb75" -GIT="fe03c6fa470f0bc3c086baafed8c6b4b6d28a245" -INSTALL='' -C1='#4' -C2='#*' -C3='#)' -cwd = os.getcwd() -join = os.path.join - - -WAF='waf' -def b(x): - return x -if sys.hexversion>0x300000f: - WAF='waf3' - def b(x): - return x.encode() - -def err(m): - print(('\033[91mError: %s\033[0m' % m)) - sys.exit(1) - -def unpack_wafdir(dir, src): - f = open(src,'rb') - c = 'corrupt archive (%d)' - while 1: - line = f.readline() - if not line: err('run waf-light from a folder containing waflib') - if line == b('#==>\n'): - txt = f.readline() - if not txt: err(c % 1) - if f.readline() != b('#<==\n'): err(c % 2) - break - if not txt: err(c % 3) - txt = txt[1:-1].replace(b(C1), b('\n')).replace(b(C2), b('\r')).replace(b(C3), b('\x00')) - - import shutil, tarfile - try: shutil.rmtree(dir) - except OSError: pass - try: - for x in ('Tools', 'extras'): - os.makedirs(join(dir, 'waflib', x)) - except OSError: - err("Cannot unpack waf lib into %s\nMove waf in a writable directory" % dir) - - os.chdir(dir) - tmp = 't.gz' - t = open(tmp,'wb') - try: t.write(txt) - finally: t.close() - - try: - t = tarfile.open(tmp) - except: - try: - os.system('gzip -d t.gz') - t = tarfile.open('t') - tmp = 't' - except: - os.chdir(cwd) - try: shutil.rmtree(dir) - except OSError: pass - err("Waf cannot be unpacked, check that bzip2 support is present") - - try: - for x in t: t.extract(x) - finally: - t.close() - - for x in ('Tools', 'extras'): - os.chmod(join('waflib',x), 493) - - if sys.hexversion<0x300000f: - sys.path = [join(dir, 'waflib')] + sys.path - import fixpy2 - fixpy2.fixdir(dir) - - os.remove(tmp) - os.chdir(cwd) - - try: dir = unicode(dir, 'mbcs') - except: pass - try: - from ctypes import windll - windll.kernel32.SetFileAttributesW(dir, 2) - except: - pass - -def test(dir): - try: - os.stat(join(dir, 'waflib')) - return os.path.abspath(dir) - except OSError: - pass - -def find_lib(): - src = os.path.abspath(inspect.getfile(inspect.getmodule(err))) - base, name = os.path.split(src) - - #devs use $WAFDIR - w=test(os.environ.get('WAFDIR', '')) - if w: return w - - #waf-light - if name.endswith('waf-light'): - w = test(base) - if w: return w - err('waf-light requires waflib -> export WAFDIR=/folder') - - dirname = '%s-%s-%s' % (WAF, VERSION, REVISION) - for i in (INSTALL,'/usr','/usr/local','/opt'): - w = test(i + '/lib/' + dirname) - if w: return w - - #waf-local - dir = join(base, (sys.platform != 'win32' and '.' or '') + dirname) - w = test(dir) - if w: return w - - #unpack - unpack_wafdir(dir, src) - return dir - -wafdir = find_lib() -sys.path.insert(0, wafdir) - -if __name__ == '__main__': - - from waflib import Scripting - Scripting.waf_entry_point(cwd, VERSION, wafdir) - -#==> -# [tmp-waf-2.0.11.tar#)kcƱ0ܯ`#) Z/iu$>q$?ӴGfq( &o#)6i4n#\n`^Nÿ / |G ?z ?~W_-jPt*ڔ? u .d0.n|u7d~y]VBʷޜ<;ϫn6T ujQ =|x3&Ë<~8U漢M`2@iu+ OY3-e\dqy[vE>toɴLuBϽV$Q*n:[TvX.R˞UrX-#*3ô4|~ y_oW"~}x,l5U%>.JAYvy +'/ˆU FٸIaMqY3 =NHS!9:*IEyVUbYe[#)J B $#47{ƱZ1`Ƞ|{\5>\d<SdMA ` n r S*%+ǜrPUKM̌7/B34Ll:*<ӶΪ(l#4g^o#)U6<Hofry,|RӓW7'g|8|mZ|Yy:#aϝfƕfaضS &?U4}͛ӻ F$u U)%"F2yS |=9j,0Pœ`v1tEV0wiuį|ԅL!Fyѕ /om峓N>~ZfR;[ bM Ȫj%fAqIXr.QJjdo<4;Y6l9 g8oV^~E¢ݙ)6[Uf~ wUd:j? m+|44VX} }jH67#*Cwv:?.h! S#*mHmH&ey \Ѿ9p0ͯua l|Ր;*ٴ}\[dJ%<p9=F(_ad`肏#4bry_$*]L`I$9U'A¥1ҮH Yл9M+̤}jw-/f{ɸKpXSL\0 3^msd̾ɈtEOwV #CDk< *+Ѿz6 _I#Get(vЊm;dbyGyZHЪ>VGﴕy?{fO̽x[}Ol31 5]1^?[?gQ-r矲,>r\ )S>#*l>jQMb]0[ʧtV-a9Xf:o2[+>zbxJU| PM5IyvC#*=`|BbvNNɧYs]{MOY>}1;5_!ڶf6 Nؽm-?r+uj4o #)ki6ZJ>#)XlUZq_GQ"{Ah]w҆ 7 q}a<_y }am/jٟ!\L'٘Lq!7]/vP)/8G /ĿT6}H ?^Sx P+x za$nYk)u!_Qoq}N{j1*YK8OeK t?y"q5e O^º̀OYp$[w |&ϸsy=/^+nqp M,>_G/啰_˃W 8GNGTo% b 8X»!( :I;iޭ.ޝ{ D`g{݇iyߍ jJuHsdYp6[9H(ko `0*em r>Llio{GQ<1@ wG霥Nygo|-dEĴ9RogVzK4 Rb)N7o1(˲Q#)e:ex_'?̻.fHwQ[$(s C,J#)9??$(yw,1me&gaBOy ss^MLЄJywE}煮-ee.xamIjV=AJ]x:C%ca;[~TvHr=ʁ(V2EIx81b1v&Y#@%I!L7_qDn -g2>źsujU'r Ӊ[u%.Ma5#*?}{߾<9XQ C˜cz;(;͂wA VyR_>Eׯ~?Yp^L`_ O 5Y?lXWͤۈ*e-#4. `] A>Q4BkHcƓKT}_) ,4>!#!SƟ-'PãshR0 RɝyمTer dlw>"'в( kȆxAC5%CNHD=͉V0}? 9{yzQ"%V"0H?#)xw5٠Aq# ٠^uC|J2X դ#4Msb3{lzSO[^QR':[t1@R' ONzgwr]⠸| }JEN5LTWrdC偀T-p|0(1(ߦAH]*=)q92b&#)vk*f:-0( #)+rL# V+)`]C~#*r(ϱ#J4^z.#)!pM#4<S<HW lE~ݼ8[h+ (F Lc %N*QJk4z xykeVwD #)G0-iN'L#4pzf0#s gm]Q %A #)esg'6#)`l=r#\Pz0#4*ÎD0ϱaSwxӾv̫ φ7+faY!ˈ)e#4T8+ LG#*.1嶰KLwq X5ۿ:n8cAdzi #4'N NL#)U_ΈtA;g%댝tk5@^L@Q )ovD֩g~Q~YNcw%SC)nkCKa\Ve%NxsMiuUVfAuN^f H7]pQ [f/z@%F u,]#)p:ʊ.;&!#*6*s!,hX/ݽ. Xi:}"jxhNBk`#*ַR؊^S̠, -20)ڃ#4Hs9~Y贋 YyY*Bf=$ʜZ*ҿO{#*.j q aѡO4o x;#nx ߰i M=C5 PjUь^$\Q ߪ, "i)}XS~c`7C;~]#*~6eW йn P+alVkb0҄ c-i7G<dpkM9n/A1z (2,&C6#4|pOuT]CJe.lhL>&&[(</ gV/44%n#)Oa-4#4zXMPBUvOWِi`EڜZ](4>b)#4Nd#)/? l.LR!H>ҽ=9-<iU6D{+Yr!4Ut @36{vBf 2ٸM2ōzϡ|Na QZ&j{$=\o Km: ܍]kE-iDa/ ǴD 'U60+Z#*wRםu3OP[l6XERF0snNZlV걀G#~à~ٛCq "Ƽ54/:ɲHP$ ka yhpY ^X Q'ϐ`E]wEaf^L;UYUdY &T,$A$hP#* o-E^ /+Y %;>9=>y zd) #qG! Pzw'MPKe|CX5&X.S0dEү"5 D#3a'y+!'wKUq_'o u屣<` 5G MveCف$uxu܋lp5%d\u2;!n :l(QF_@[v$#* V(#?|y/!~ e;`/3ly0̓#)VN#)'mR~-EOhjey]&<HfJh;X*hk sIQ$<(:xK9M{uV_zl1\آѶ^C#q@HFCWEQ J- T 9e`FXR*Hj#*#I' 7xqۂD^{=Y|p(xa(b|8ճ/b-S67hxn#*l V JQC\9XaYodjp6Oagu;#* xp=#*ӝ[$ӸWP >yj'e.}&vC.? 2 .l!zMQwDYw\^;)/N&Mf-lgC';0fQf4S8E64xo9f']zoK #*0YD#4Q/U#4_4@yc?(7% dMFpkͮU6nu Q?a[odӌ.͖'Kou((n;F&t/P4'Ͼcc)ݥV>8QD#*]Z=Ьi9 5̕6=-GYZdn}!sڷGa `C}bp͂ !Ew ]#4 l>ɅK5jێ#*܅6؝6 >nngʠ@lIJ/E`1YH4ڑ2L I"8Lt'SdPIђP, %!>ARD&RQ&d"Ϡ"3:- /EfK)@ve6vsoWV]C Fj^yd^kYT 5Ve ;Jq@%ˇs7ʈM]n|S.kٌRtym_ u= mG\?7 s&"^b` PY",kF;ͨD`TJ{QU Є') Ey?$;F(ZEɀ2E[.qKшhNA%NQG3 )]fM#_r3QCYV]#ug#)\gGw6kGҢRSoh׀ Sc~8D""6fq:m9r%*EX^8 3I+j?zpZbs^}D""dx Oj .g#tAc#) EV+ sɐDd kyz?m4>#?۰^ ҝ_i)/Tlܡѣӏw<:/jX4NP>HX_>ꏳAWr͍`N:_ ?{q&=۳<]UbA?\}aQ*/κo#*Py1itk:X#)3o,/ *RyL[:ɰ^4< j/\#)eÑoR ъ}# g'7TI߃P>ˁh}˗ȻWLsH~{pL ݁QA2p.-rwpnQ;Kރ):Sa']#DYd@`3 $m6 lnY2v/!RG0!@N씀*FK(r #))aPd;n3 #)#*C^ؿzusrCۅrEMYS #)j"9+[i*K#4q+4izRRb-+H,FmyY>_#)K]TSť W=3 Ͱ=knHSŁvݜVތ s3$#)YBgEr8B Iro#*ms<xX%j-j, KJDtmX =: sPmǀ'b#)ݽ.ێ eV;~ $cX|J B&jw#)yиDqC+3;+l(Pf0l#)Y7A5"pXd(QԜi+_&N=fn!3f"w7Hq%S{3 v (vR0aFǪtm.S3IkVLCQVG J7d0KVL^7nO ` *Nx S*8hˎ'H(X^ G2A-^1N> Uwkge}\. rl:1v`geU"X [pka0ͭMȎɻW7d;#9 Hk #*71mu>=]..%2#*͙mv֏=LkQU ƪ+"D" C]d~ m݂[4(bc6.!quYa70gnX ݥc3aiR )=/UBj 9-C 8] |OsuTV4wW#4,AhD kHG$C2qaMwndGniRJq4>Rci#4 9LA)U۔ ,gn ^#4Ah@#*U`.%g9ƻG1pN EÄ pL7>@ @!n*5i\^e) _'Fl~f<lF.P¡n< Zj;5\1_m,H/7H,#4c6K%ԫ|"X,u#4E > U"2.NXueO..H"y놉1 ` aՓMAGf|Dkve41#Ϸ P|`am";|zkTKL8Y j%JѼT7yb<]7E3:F<-h< _^т[e(MKћ7&;eZ`2=RbIzp+w }A7^Ο#)CxN},M= " Hq6 .-#*p8} ~#4W-HZ yfSSr:ZŨBDLm#ٍpIGDwukZV-CB3V+F+H#)I49W!pp46r)hA(823F&%MǬd>~Dsn@pI9t-:$x VL2x#qE~|g siA =%Yv0sNbG9RoL I>4["pjY{DWȚëҐJ(1\D@ëY>݀uF$Pm0-E$W#*N&BAL-AQ2`M P<^S#*|&/F-9ɽD8C#)lb@_LrsI{:e^ -JYivkd5u+gbGT&|cipcA8N%@+ xvKd :q"[ާeU :|O2]&T3 l[QS\O}W-S+ôL5)6h8 pyaex$H ndlN! ͂fU"BN"BQdliy(v?;g -3%LǠܞev\vRYV/sidtL&0eN -X<FRAٝT+y} tˮvsm@ #4ZDĤ,Ek=;.J]C WPV^!x7Ӽ BjʞXTRඬD}YN:Ýbo#*8m̵;]HkĶŖ{J2m%+He#*&N#4qmr]|{^zc2iTo9Ӷ4 oF5F L#4~ ju8פՔÓ!쯁J2RRqia{Bf|Q%#~rkC̸ܵ#*콓j@: l[$;I}oV͓稥I['MjW^?nv?1$~f0(#*@-Ы9dk%{VQMDSdSIq I༎$f|9ÜLwC 7ĸڍZW/[bc}9*(emX5:!2^XCmP%qSMuj#)W(ĵ#*[,QbG)t)5N`/h#*6 $Wlw#)MA7N?Ӑ( .|6^M(Lt }*w.!!?uH^VnT Ѱڨ4<fv*W}ﭷЯ#@s.S(o1F(Ud-{3t;3ZxbpC #*SdK`ޣ~~6mem Q'Y?s؞\h7im)V5:\ݕ?h"J&tmZCw;2~-$C0FƉEK[p$V;s!#4%6#) IFx\ \>- bؼle6ׯ4j JJ| #*~W/?{͏חl~Ni*FqWt7\)o]d͕ĺn7Ik_1] s#4 #)+c#)#sӷՋaǷdnq#*"+X xg-5B8&ɂڨ}Eq4taN3mlk_*+E&q$ d=җ Pra֥j!. #4Sݚ<knW>+>BX5uHs6*Hn(6#*!ҁNA #~j R1#)w,ZyvŭcwQSE0qpU#4K&-Lйwm(,@HW~}25wy|p؈?y^p CŹ ZUF!@#*Q||/H_~n>;7UK#qBwNLtTv ϻ{UYib.&QK?4$\_CIuu `\6;帔~X+S%rmi3HǚB&6du"PcB= u#d͎ $rQh[.m" PyZwL{B#4RlG~ JN_7OR#k\X.a #)7Aܚk'i\b#)r )5P*!*ٳ"-eަ |▕r pwzz{ڥmRK=ًbH!e1wxxcH ,/Dr ]s5( .bݖwv7o]V6LqNu ;+п3Ud$D; k #EG#*H[cM=lY`?`Ɣڼg6bvY+m]1uni5m1-eϟ=8}Ml/EQSՀS2+ "8ept8әz ^pnn(' aomf*ю^1 #)#*&:#WJcrf;zhzPó^Bb 4$ mx[2 Da l7kfXL۔$VqEI)R".rQJ.1Ъ3q.:p=HV}fNᆭ"*J7pJm*FZ0q hTzHoFwxBr#)'X3MDMp]u#_!l.v= VJ3%R6쑍.!ig;9mW˓7'BՃCYHZO+N Q $`]6 ]C{# qO7&ۀ0w! Y0 BX!uKB{vo?'[k=bڢI{ͮكg/O(^ӫ6;i֬TeJo &>Cs'ٚhIMhAQ8 <} exnH<- cH vk){\oqK[\b9ɻIwz7'6vw`L/Ǵ6M#*'㊏>[ۇҕ8 `-,\KcRpPrץ Ͼ @94d5=)` sےM2Q1f&ۘdn1_Dj4Ѕ⚚%5%WSS֪n Quܭ"m5Vʈ \B!;-u,'dp;KnT1Ld VU-TBi0?$ޛQq!oxsr2d[1H!G ڀ<8d f?(:jȨQC| A5@.oǦt9 vDǵZrqiLO1U=o7B!#)_N 5,o?FN};c#4,pη*1鱍E` ZZoɶWztDkm',#*LJf 6? 돛$GWa$8d5#)M qBmr}C~cblB#|7Z')]LN@' `sǞ]fds7}6j#:1&yRh#4<1cg\F:X~] #)m&Vb^Mkq̈́jfRTĦMPj湺BGu <̀RĘv{d,Ez鰺X5o }Jlڊ 7N'#n<>R㮘M$8l >0KGr N#*r7D.tQҏѱZ}: F$85#* >_!TMVZ^qzYWYrIP坰*I:O>Y~wT <̯"U '58Λv̚ 5P[jײ=w#ݰk 7 5Ԏ(;zE~Y ff<RM|1҃2h@!cTڏ{*FLƫ=8{i,JB <~|(ܱ#4#?cf:[0Ȧx 6pM #4#*E*#$ B$#^ppC40j<kR,pt$bj.n06'x]#(=r}ӥzwF)6Ee &-r[7ei?(nX_RZ=n9nOx61z_~u7o M9;~;ggү}yrڛ `iFLN[ ד| iڽH6ek̅>Y$3֑oD@J`S)#)}>\s_&j#4[h+;;q7շI20q{#)7[&KIAFL0GI/C X.ik^^tPL<#*o#*2o]*YlPҒ1(P4t) bv$xjg|jײF28la4AGZyU˚5װ1[ gc$k86nnߣ{Gc<6>JȻ^n߾2I xT.)`לGW*4r[a cu> Ic#)I4s-|"zCٌ(CkT7FePͨʧPޠn.dT;#A^w#*P b'KN5Ɨ` 1{p'ͦa_ N]@( #*Έ iɫ\JӲ>y* pGlP #*Lֆc*cv%E]>--.4V/#)a8kؕiK#q%o qr9N@[~;0I)e+٦Du4k"G.^N o1$#)~~Ee=Ɵ.6,Hߋ37WR I 88ab eZ''8x )}vDZ$`JH^f!,qer2MB90Տ? zum`d| Rx#)V"/Oĺo +Hae8rl>` ']:R Ц Dk#3z:k*oO7?K<~/oKoSgwǢ^~"_?5~#)v [Jo L~ >/rr9Ξ??_,ag!e/W2|6ʲ4~9WkG[CBT~u)?~D5ܛJ|H9FX'#*vz{q!G+s"m#)z]ုSoRۯx*nw@>t~ >>V#*Z1IQ{w z`rAP2<_'1q뻸=@n1MwvEueMs]2#):־˟w _E-sUV̙*ٹ+v{p)h_Q'GE~g_ w`)רô0D32NlFdn*̖<跻w lw0iA; hkDhϡN P#w f:cBNv>@EQ TF&;[iZNL$Ϡc,%Ԣ@|wRyZ Ɋ$> 3$#?XȈa1fV6F ;%)U!HHBsE%21aNRa [!,`Pk&& m) U+ %k+g[(L_8<S3mu%x_qfxm̌ƬE\#)Q fIT=45"^T37쬏%0ťFZY[\7`F#*BD(̍;9ي#4XE`R8#4{Il>_=bԿOQ(Y'COfΟOέ=g+xJBf?4 Efh6PGnJ䙝@ ]m z0*3b;DhN#)7m %N-:bmk ZZMSǒtJR]'YfěQ;yiEo([ԜIHfuHZ#)QX&xG])aP d:g(_(i|Ļ:WfL,)43Wrm0P;cl5OѮ#)͙7W\ijjE&Wk]-eX[In^yI^mWGdtÄۍ#*nmFyysU;,ߚyIѦюʭxm42%*+iAgYhxsT5r<ld6X6\U H$@&W.#4BH{>K$6 5Y8fH=!nޜ=䍢930};E6%Y9ILsW9C㞳F#ڹz.VKS ᪓>Yגo2/ >9t nYaP*8QSSL0Q8z tC[jEC4_a 4 m-5\ 1zªc^ODHxk2c6 57k۠y #*N(]I͚k F3mὔ#)xCE8ɎY,糵X_H++i#0s̟s%W|Wg PXPϯ]~ +k$IjI( -Ä)C, Bʡbܥ.a()5ALJ^)#*E{CO!I\EANC -TD n«G9DZ?XR QX݁5[l缀 a=}2$َ%M a:m~w 6|RFGV3خhk5:iF9D#f^݀IozMEȅZm}5ܺ!] ]x,ⲲpֹאSq#/>FY P8vRiK#Ur #)$afIG1zx^P`u k:qdO;RA$c] ta傝\ bÍ't:άe#*F [Ǐb ܊} ѥ F@!ԚQ'ܵu;Ɉ}`%#*w^PS+PƸOoXP'AP x6RĪ]l 75Ni~Э! r?r; ^ Ш_èbۍ:0Ǜ!&F^m?$\TZ}cddmq+uq^" i~ƺ >Śj1 | dڝlǛ+MΪa< T Zz>fOO*W"?ThHf]YT<@M=]K/I?q5laeĝ:#)B~#) h#*w!f4۾ قG C#4_x{MNmahھWUz% w(ICWRd-q5={7A(Mԫ 8y^7Ț:vygdp)E$eL8$Zq/>Xoء[7CEqc #4'#)ߞ*#*Ln{rPU1]$q_ѧɾT]ZX|Ovl=\1]AQF> YL#ǶN1A%wOOyd)_Ҷ[;c tc5> є8qr3LB?HT̹6xjR#4VσKN-2a$NJ| k2 "'U+s$/&iFX#4'+H #L(8$o߯-H0$'O >yGw5/q~8F[ %i:yx֬@#)+S yr`bRd~_:voj̡@$6\|#)qN:Cނ.c!d$#*V"-!'C xH#)#4E -O tP]'Ί' $4s k v x &g#)G!jLPG#*- <j^0u&""yvE/pctTO88!L/zUra >"eRxHCჩ&p?(qV@4J1E'VMHa?V[Z Hu(.=C8oǹ|<2̰,NTC?y~ d&Ut#4o}M_| ,t~.C{>^@#)C.ɌoD uV" ,X.hMrhd=,6 _?r>+MK j.*Q K%t( ɘ0b ћkQ}hϯZyIb'}?%zcdȕ!j}Kei/eɹkrYj*A # o*v)}f۞3>(҉m< %{ADDԘ#&TЕ!REolQU̥̬ ԣ\$Jۆ]w'v Dry Y' šF%x a #4x3wn֣9^tA7X< `mC,՟5!Ikf9g# [UFֻ#fz5rc FapLxԤ66^C*!b$O _gd#)|_x>6as2ȆgbxRILO!T`k9iFWbqE[~G?[ՊFBx|qOy8.u G_S`VdzN~I5}_ʼn` M;f'2ͿFԼf :,`P<ډ1 $8t dW9ɶo3rPPBe/.O[zJ0s$T-QxO$S4H7#* >}VɾHb\$uc k ]E&Rf#*^{ *p.(#49{TS ہ ZlUAv-`J2BlZ+gnHf QdXĺͪ#4 >3Oimfn{f@R=#)h lUc|%#)$/$jһŊ֠5dk.(#4Nq=gM-~?(rf"tO&ҫ4U>c/v#*?k mXUNƉ^|m'mr/Yiszf 5 *Dh]_.#)XP'd8ޘ됍}~XlTL+[ Zc BWҼ m?3$}JMFcK<=Zs9OH`,!1L ܱѹ$;,+96lb>pru1'#*KA`q-tB" :` Id3qo=ww\ a3 fC\ I~~TxxXpy /qW:;^LgC|X 8d&\t =%@QYQ8|16f"c5=rHsx"u9:m&1g]88ɗo^^8=ygO('p o^|ƒ#LkԍcM{yXۣqN7 1&Wͭߌb8g2C9?~'< I0s]4ֳhQ;sWQc>#)@VxKY' ;2-);W(qN`]w9]U8[4IwDJz_U_/5qz/ B4nV3;oQinqxm#)ѹl뉫"'{D[Dy}̇loowȖqu#)j.l^| tGKDtP~`g Y#*-=JD|l֨cnp.>{/|__ys?~?w~!G`5B'er|L/ W )|s #)a ŠbM ȪWd8|g|VK,r~O>#oofͭ= M)P_:̫P{HFLIKm"wn{u\Yb o`u@* m=&w|rz|VYDZh6Q<&6CLW3xA#)H#*ՐhF)#Jv,DJޗL Okz G{|=kXfEG2i#4Uw#*IzSE2Q]US ˇt56H#*t#*3p16L\at {rVy0\쌂 d:>6Og#TK1pC(j|k,^H 0.xtyкݮACmx eĪi$uT#4أ</Ct mɻ&4"J2*a T)Ŗ P{/T ~2jԙ j#*4bd< E{Z8b{Dk#4d(^#*a< 8nH0ޏ5y5UXFc?)kF&h2Z'@G}GIӼ#^̖Wk^|k {#4 qv]gڱ ms% M{_zI1Ѯ:BDCAiT# .M Imij@gF7_h5n \ /{b^q儣pAI98O lޘgp\0p'fEu+=Q` ".x#4ie)=#4CvSG`$ظ իF8RT'IgHǏЄ8]NE{6l"ɘNLinqf& щSJ <cnH/&}=), &_94s)5KEe$D*ɐJ%]qy ޕ? ~*h6p0Xׇpu둅#4W PXB#4awL,)*K Lx+Kz N0\F#4診#*k"Jq=OIzCѿ@au5Vؓ#)U)YgPREd3}AGA9βHo %u=f#JD [-MvnWI0T߇Xd`$jA|;#*o"'\\q0/>O' h}|e`5pFs^do.b;D*!|w~ c7z㶣; oQ89,^Lc8Meֻ,"<\Z#)#*>>&hz]dZ zT *Myleb2 ϪPhbѠBL[0 @ ^r+KAu ,ps6 ]r.s P UB2qiC8 #m ) _9lm.(_@t2#*C[`670-O zPoz{˕C}AA1)Z</'64G*Yb莪ida^IWgr#*@gW.T#)3 ]|7#* ȭd0iSzdo^u+j7:lZ#*l{5bQ*dT{d+T#4L8/]X[ !#4#4 g3KF轙JSr&s`WOY[>#4dX {JcS. Ιc ܖ2}0}7 vF# H8Wd^j;Wvʝޣ1RF@ j2О;a)0_)fjy`ͭr;WtJ"" + +ɻ =M#*<vtCN`xY[1Vi<U\8M`*/N$hx9 eCJohBBn-@lnN 5Gsk4AW y!Hِߤ#* r 4f騇fPgԵqˊa= Z!2+n Y>nE״;߽{, 8{b},Իw;h]m87pubqXJF/Y$O @`1JA u o- R& <{ >#)+bԹ8h)ҮtM {%z|ZDsǞhk4) ]]' wW s6+q7 bQ"IR3<藯cn^,,ُ^#)צ{m01C951G$Y+ApBmD۴" oo't=uNh#4,%<acqo6tl|ycۖ־-2/Z[Yw-wy N=0͎ښKf {iǺr 9ah0M+ImO' \ #s 5-b&嶇[ʵ 58?]kJcM{wU~#085xhjBr3" ,}YD{7ksۛZb:*d bapgG!Pn8Npwb g \7 # b_ O -e X ]!)}3#)>n$ oQ.wf0oK3}L_3wY w d?4=y Yb^9&sx 22x<s(L2H#d9f-zn帕YI mGJ<n ͵k Lkqo;xl(#*l$P7AS#*` iQض%~4}7_QS P@ <:Y>cߧDL>~h_MUliqpE ".&4.x38Q =b=qD:h~C »c:}y<{N^,'S`KMΔ*BRۍՊNt2LVM#4Z7& @7St?ҫlHW$X zйN;vӓIzsǗ;B.@n&*1/H|ZZChc\MzHwo50 %SWVeBE N`(gCbцI6\.e|lnz5R]{8}EX@q/ɼJR I46= B(*f)lT"lFpJQu*L[#)#*A6-{P˙x 6ѻdKv#h f]+T`#)6ҹ'rC(]X[!8(w$u5Je8E9py%7sc Pk+J~2}JC~lqJn]~b2#4עA9$}Fj b$#*rg9@BN1 勠~SMp L({Юrm{.t t#*`aq);#)hxgD:ts8}m ` ,Qǯ"Fv_#)E-fyJSj/J'ָ?˰As\{4/Woȅ[0aMeN+K[V~ Z6 m](Z+~u"$wGA@K)@& J s!PN#Jrn ؼ{.pU>; sW$G#)}f-0ְ+f0AԢD#*4v1# u->3}\o#4t@-#nw}}#)Vj>-@zOUi}cyX!Ti OJp{8;L'r],//Q#4tjP^u m]q'i(ƃHr^뭢ҪXj=5ggǯ^[ȣ Aq yoX3 =༥ m7=ȕB̥d;kjqQ'U""Շl ]ޔG QU#47/HRGEuT:bV<#|2+uꕵ4-<)fKfjJyNVxF":~ #(y r."J;#4cFuiQ "փ6[#*Ƴ5ݑ؇8$u-uaTݬ{܇&^S^tw~k x`1To4 N9}ry=)#*k k+Z6+9=wt{B- i2},ڻn5}|q5nD`]\ ;wffZӁ{ L+6P6$;T#4f,Evڞg@|*N1vgo_dtc/tΚd~h[rжJQnJƚ#4miӝ-}a,YKKp.(ۧhRVd;B ~~#)7_\:r#wMI3IDX-RS z(PO$N77:}#)oVATyDieԃ:|"Yw a+(D|B@"ѐqt{ nε礉n6J4P 9Y:P)7 .A_kB7RsgBR_$5a Wj#) (K >v«cdiԮZD(%:}MYF_È41Db2oҠ8Hr]\o ^:)2;҃b*I5͒D@)G#ԛh$NHM!}#4Huyܰ~Sjw:X·Wh=I6E1\r#)$^ƞʇ n!]엔֝S#ڊ $k#4$ (q&cCŰ(#45dpxb PpHLrxȊ j5"ו#YIp&B{'lN!S3_h V.aݰlH6->UC2VM L >"u#)2-75"s0E#4sB8q7"g&3mϊFjbŊl>NHUOyэPQ4 qn}N}FY"mK.W?qFaSRwo$<:1TAy3lJ)*x b><ýVcMt^yPPD@5x `F͵mqm 9= xv]UJ bHX*;мŕ -#4T:l,t',~|铺Ǔ'; - hi__G~ Iw]7o:gɽ'b怯ΘM K]/T;K!蔲Ty+a?$|A.j=ؾN$y7˗N^ !xf摉ȫ<6T㓦xΈ'&qC]ػ#*QξnjoyYRv?GeB s'CFɜ+/Ĵi٪*!3 (;Z¹m%2К8hYtg"ϞB#*@yF vsku |01(`+o#*A{w>;#*_dez6C'hwu1AgYq8/X3vnh+dy0d]xxFY#8jsm 5:1SȤi#*}KR8L#* h 1QPmB#s#4qG{]#4RR52c"q) 'o. W3o#4é%ԵǢwftx_'}>+Ss R&U^W'(Mݲ!X: O)!·Ȩ \x=kM*̂v%s|=ѣc`ـ=Dp @ 8qeM+nm nHj͵ճ[@'Vu'Zo2-7XO[GAkKyMԡO9~#)zL2 +W!ҜHG9msZćV#*M;9D*>;bv]=k]2EJܔabW Z 0f^Hj8ŭD|u8 ~/ _HM+DoR#)(".B}T#u"`!#4broKz{ u> Ѥ{%bIUs,cHBZfr+ 'O =yϿO? DoɅm曓d˳3@09<aOϏ_}yz<<v$?}kxmxճoʐ~} v#)8=)#)zyy~뗯ӷ_b)UoqXq{5Kl.Fu1 A"$7+Jw$!١Kg 3L@gF S "4VPeȾoB3*i#~FY@Mjn|jIW0Ѥ]ijàs b4=THBuh ?c>GG4Aڃd;Z 4X:>;1~cL5ǺaP?>{s =ҔicQ\eIi &(-EqЂ#*$Y+*TN9acB)eQ$j bˡ`lƤTh~2%/{mP}FJ#*{v:*79$7#W,J+dN#*ɦTR'ɠ$IL.hXSvfI}Vd! UM4MDƜ#4(l0m|uYTP#*<DbyFGww !K y<vpܓtmD Q*p^GX 7G)Y=oOЩ窂yJz`` ғNBÖT &CthV uQL{r5(+3BCnŧTQ !~ӈ5%B#4CsuZ!7'n<idlsŬ ōrRL4HbNM3s4j35[3)ep u0.'kAO֠'a(IӅLuYɚG3 <aѹ) /topQW/A@VE+ ~3UrM#)e\֓9f1 C7kU VUO * IQp5)߶: %+R|zWv@ w`gqDvwsyIG8.1t**r8#*|*M<{X] Rl9t:ty; Rv {8 Z)}+<y"SZy v#*9RHԟ [;aehL"+Z. $ wk7 7ZkF;7[ksi$Hqm1d T͋Odr&qvۃ v LJaO%*ݑXǤĵzӎa ~:jiv B"N y#4cNMʕA;%5$SSw ^G?ݽO9m#*p<C Fxk<SiK.٭2}qS#0" Ēdm`(Y$z\!@K2\Lgeb*#"bH&j7bPs0F sG _s;z~klL"q<~rf'Eۘa%|z!;K-Z<r&O)8uOC塺L&#+qw( K +ذ4 wuT#448b#*"̂# @DtRG8{?FmmA,wxh교$z#*\'o~#4/%m8ZiJaY?N$/un{Ef7JB*TW`c}kdyW6 PP = :Eb9[faN q'JkKw@N +p)S ν%!O ѿ$ҽ>w:q)[$q!C#41N1~3=NiOxc"oUG8: M#) )wdpoxޔ:s(̠B Bi0WePT/KI"~KaiD# ݉ӯ$T'a_HQ1'S6薖wp1TzZUT¹ދ]$64bo B1IIrn;>wϪOʞn2L5̀çPÔms|R,$qb%+CVt* qo_ t#4ِ11* V#)5їk lR譄m =Q 4DF[#*& JF$:& t2>c}mo}HoD~P 0ƛ᧾ݖ[M/S :rʃt=#)FMO vˎIA{CG7k}#47јA8YΎ O ǐVPm5w]=gOY_~9p1G@N&: qxiSKKԘRvDP PE wQ`|XKuFaNj3dg^ IlkoTñ;LM=KeQ@e|F AЪ ]85IHDfUlb<BȢ/#*ZQ;eAeO][#*sHcEO]ҍ׃vlVSu|fG,>\Ճ.=IP҉_/c(!S@^(+mp-Q&{wķ~ FlܪX9dO"HLZhF5fC #\.rWZ#):+? tYS jblmzh<o?^ ՂZ7CV3+ (*[ݗo`0a,!{4IP3,N>jy!.+<6 ,KI#*@5c'A+'mQק٢ 8r\tt8#*.ejL5*1e;)ȱ'g.a#4a_WA3WeN Q" Alq.R%`v Z5.5 E)4wmK}3GɆmzr6St]S1 vefcݦhq0vCnbHϢMA8KЏqG+Z]qO|je]W{HR#*\a`*!]jG)F-uW%cR/kljZ*N\ 8 O`( }C`rOZ' !UګJzALA-aP!ݔa7 J(1ϐwWgyQ` ikV1i~CZ% #).F7#)3Nc٠>p4x ya V3 ʌCXj#<w;^݄!5!m`a2uz (u:p1֘f}v9j[nh tsԬV4!am.#*P0Z#) ;8VCҍ485_(Na?pEBFLj`JL}UڑqsKŘ 'z\(jT&83EnSZ+cj6-`$وUpeR} q,*@UOgOr<H_b c$-t#)$#n4hqnpa~Щl.0OEwWw9SGۙsoe#K]pӅ}<z[#c^&ax^w)GQre;bvTfZ3ԋyM3rCHa!W] ,C*s7ii <aV'ICcћs0j JFquGUI8s>nB ӃF5d902#*guA#>۪+NB UqtMh=jiViND1 vCєNE:h9q F\ !`=H&4 iH#4l7:nbFKތ9լ"_- m2f/FWܕt[ôPY9nմJm8 Du T| wOi.0Vx@XN,7 w2PSi#)h/#*soDR*\a6Sk}z=vX ܈/Q#)~NS^65@C 1! /v#41Wɚ*Yy:L !HPN/Cf::Qg~el)Hw|yja Gy]H_D@́wsn }<8==LO4N\Gr 4% K'V:`'41w F|-WKT=Ӎ2@|>Aey%t i/\]CZ6Z=ZP=4PEK=u;ΣS:Xg/On6ŏ>2C[6)gZuQ|/>.0CAD :s ON8d8Ă?>Y>J3X!ؔ1Y.PEME04].Rzv0ANdTw"qDVH.|x #1вFA J!_T6 &D:;c.Ɛ3ku'}gиQ5dB°trq#*v&B4apL]\^iuMR !eM)HJ^ _1k<4,!1P)T#)Rw"rW)ZkU#4itꔽQp#*`ilտH}+Qp*EsC 9clqBmob=5pq<I&C>MnvLa8${tcQH]?xɩB#)/ż@ibTdָZ%<F4cW]/4l9ELDч^w MS5'IYKѭJZڬVY8a0/B\ ֦k : &U\[oE *2E_Ʒ8Gݚ^ZNAB) [S\g6$enb( &6bS8=?7 QT}:Mhdvr~r}/ 7ⵚmO6>Q(dԣ/4 Q0X H{+5T(贀 [c&Ihq #4I uX#*ۀGd゙^؇Eߑ.X>JEH(=iPݮxKdzn_K^Wun UnxVo\{ *}_y'#*gWƶ(ewӸv6@?_v@.1ITjP`#4UnB@pf =ά}@Ώ7wN."~o0> >^DKEd)OT#*Nm Rk ~l_6<#*LI9!xw"Q|)' {^ 7CEqo0R:N e `/-cǔ#)eWFg |! gX#*ΠI$ k =R#4v:[,9C%)4b0jazE IWyd6;=Hiy4ϼd`SU͵(I뤪B>^$*TH8E4ݲdco=4qEjI PKqZӒ(J]ES z] RCh0 .#WRf.^=@9c!bQxzݷ0O 4X9 c$B1`:X?3 ruZE Xg&EwhG,!n`;_ *LtS~.i4 HR2-@a6N/Q`xI_Ds, F%g YS-HJ/#4+fN+<@Bփc0[!{Xh \;Y6̠Io;_/۟}UP$TȌSHuDT^qNY\vիAl |K|^`2[kIHaT40ʖq̖6jra& 3?kEuF!>9#*Q>@]>t*"뎱0:%|ӼtM#KޥylmO,Y&e>hNᐳe`8 &f[H Vu+͗s)! w5"z랕 V,+b8}ROGE?̺ӿgV#/E/;h P UUJP0Gi$ڢNC#;Sw#)0KP*5S,)žq, A ɥU}8В1'S8GئsŻF#*)_u0]r\cx>v#sr U=Ƃӡ;ۇuQA| \Tcq"$(fen]=<TG$}+_`D{x9=>vo`YT)q gʯ /p-o4s@Y[%ɰ-=|2YU]zbZgy6j1n;YJ\'9#4#4:#*P-*>/KVݟdZg#4x` #)Bm>XkuzJ'=J3Pp oHwa v1)1Ӱj<#IC:=NV.`a6B!uXn[)9-+J QwY>ýBaYvMB:paji#4W5_ZI|1&9)v|`ɍ;lip\C wg8Jws;C ÎoIFJcjei(" R{YɵhIzbtM,LieA/"]n<@URFLAߢAi6k$k'so]gZ WgxiXɸ,-&4Q';<o>. <@I\-p8z)n#AYO]mdξ"ncX3JO>)/fvf:hꩠ`2RuٗEc:`ndU8`2żm5#lr!E7 }}J,Az48H/Wpxѱ}Ѫ\l ;-EH¨ itZiC^FP ?J" Pȃ#HC&?tҠMzWv*ZVk#*s,aR >_\͜#*O =vR4J7M]\?Fr gf Nv6MgYx9gq!oEU#423g|eDY VՃZE<(5šGelyO<.kݒLpځ;[C>If2y#*ZAYKQ#4m#C{"'"مK;2js]jS1xI~]Te2u$;H#)U' V5r0 ò#*rU8ڈ7oWl{1 Nu4 ʟt\T}T}{ .]x"SDOu7/-+!V hn}O\~. D\Wcߓ NK]ɬsEy_#*bXU:++yV#4r"cDCxy]>1 %5mePgw#G(! î/\<nZpգ-Bt.MAq kqmy줶- CJ\Re1BPdI!WLLvD rrNl穓~~dv6G6C- kتVUb!X5WWL'QHr+؏vISdپ0z>۪^sߔ4wu6nXEH>sQ}Pȫž߱SSpfrpP2R#s"uIk W\ BŨʼnbc q n R v($l#*DuM*(am nxJj%E-ۻr1<Ի#*x1Yjo˯_x?d1reBjGmgKhRAY= m sW0 ׃I#M 8īW O\ p~*g+\ I{(~iLD+di_ǧn]v@#*֙f#*I6\ZĶSJSgCrԈٟ)zެ,#F*(q͗ +bd?]w L_GOw_;>{ }N56WGHLY|NK=7mm5k~gg[xxΧ۟f';>,5^|yl5^~~w56> D;Cq%AxݛBzyZH wirxQƟ ;p7yo6Bfh_T !>Bz}ĮG˭7R0s^f|}~xkߧۍ/ }#*[`M(?FUN]m9j#4+X4yQoLfmr!.A|1|_xI+N&%4$P84\]~+`F] ]fM?=#*SvTdNnsCՊNfxVkmQ4pNVWy?DIUl7ĽUxWN''*j]}C4c&j'P]CnT#4Lk'*RǤHHzI@-S bZ~hС^;ܬKO]=3ZV=-)*&1z?,eIT>&id x->ᤫi0HxyZ=~W痺C;~eF cj Dm mLo,HpvBh U^̳qkЬuС{Kw z\S':-@<%F;iY^ U!/dVބ9!jnAAK#*0bዬdI~r#! \>us/XjP:{<.a~b97<oDhTL2OK#41[즂Ëč:%V<%fG@(݄r8"6#*#4;k 2V4.r#OЈI!0j$ A{5g}=k锛~-)eTBmBΕޝ#ֲUkمXϭBeTG `K:ݎZ' _AVE.Jp;RϮ45SVh:OjW6̪9S5ij z*ȆCGS;l\HĶfHMIXrBYh%V: {od5zƠ#4Y|4Gb1r=p}#4J 9'ltyC8##):h7XqF&{_ O6nRuCf;(_]VcA8M+ZbCWt5en; Ρxb ݾKgd:Y0NyƴV䴌#4 Ii 9ԣ `]R;#*6#)oc|)?GñKzJ f_Dw rz'cSS1'٨TLa1U|odW+'b{7Ԭ2?AFv0g9w8T@/h,ϖk >ҽhvfjS1<y1XLN1Z]#)O*zk#*.P&%r 7 7XBulb@{Cˋ8uÙuGpͫn(́4`ÿ_9l aP FMsmNѳ JJml&8y9f+E ߎXjeMשuxcFoE}]v*{{m*-R^6e(Ptȅ߿;"15 uYZfEf#*Tfgc( G,6c eBysܻ ^#WY4 d 9XǍ\P$6 5##4[J ġx:V#*CtƛWoF xŹSqyQՋ߽~ Mj힌14D*ݹ)LR]/<i5[5iCGk#44Lej0Y\q16鵢 о#*P:J_ |jK1 3v M֠8L.uܖEz. h*gfj8pqB Ɇ#)"B~$kQ>Qb;E w#GDC2 ʆTeYL*ols M"#XH+ JPM' <#4k!fVB@It6CAy(YS:j1B(^>xLmf|\d79Cf*G4'WDn˭hrPY"gǦFb'Y("q ;Y#4;U.U|a\@'i(<y .x0\^k^y\;SӬ7J4;V.9ŀ#;T Z# IYyo89seLg%3u߯Wޞ<7c0eQ`)^Q6h;%k+= <l' RcmqcǕ~ t]'#4 Χʜ4KE9a,9w&鉶gz8.q D.O'37DO7[3Y;a39%<.%n#)8-CXN=Y PS`]T)J RKz>oMp'EWQ ?u:}%l2ȿb#)R~s9ꆗ/O"<g pN .4{ݍf_o"HL#*;<(<: mi9SHOJ=0C5Q|0%N)OC9 bDCHq}9rWöQ;u09(́) U`K]]9Fn6#4#5hD ryJ-#*lZfXߝY OnCFԢZ-{+ޡgϞ|߉7' _.JРS@%b )\W~J F⩱+IynɄlҨEٜ/%0}#_QF{~4='^:K27G/^Nan_v^ ?q"#n|ì{CHMA<b-p{qQz9 Ao-~}#4w {UQުLTo8@ EڲΪ[ EhİSDF4<íPek[&Bkf)?Yá6W٤(T?E8ȻO UTA] Wr^s_ |sAsS"]HT4u_@'/kI7]2;2ӄYktP]"z"%z0/d'> G5`ݸ!YwVh?:hGg v6>^Ml۽F.ݐG+ e Ȋ$JB[\/S܁*2C6cJf 0Dj#g+M+c;rF 6*7 /m#)d\}g< m6oi9 k:Eo#*vRO.UZs#*vW < 9[8܋UUX=~ca2a]ՊDlEըIFo#)t~Z#ڄQ`F%jҸ#-H' Y/''ptDS?Ski3=LRm* <NJ98_ ; 2'(E^ 'W#4(ZWڙQHGZ6ݞc[W|ֽ6iA?Zb_#)*S?^efUL ]aw]T `KgT[ ȲCdPҼFns0`%r"/>IPUD`\f s+.^TAޜY >xEFdYs[ kEVswA#)_հѝa6ɬ39Go YC āVӯ\k0tHf}p{Wc1 =hdJ#4n +=*) I] ٹdߜ79%vx;V`X-o #)Ёxe6-`np]%,=*`Wdi v?漞7[#O("5'l%J>NaH.# V8H95[[#4};Z&brX: "^× ֑8%eRXwr[ӌ uL|RFAn<~[=+uMy G=ijopoDhA#d݁'Hu̢qs3?jTt܌M! r,}yz i"V1%\T>L&Ƌja >#*#T=OΓwa{yGC@ Z U8#*lҝŘ-P&g+tLD> #*ʪ#*荛=%Ur|$8&;Kv*C@/J@C}'vʋ8D@5x-6m#B ^q KB*FѩLW^r z~4#4HVaCq1t%,2+ qZ<. !#)/S h L;|m:XU0i G$h$ <^|lʬ:v6oW:L@VƆ#4\-DqLWlvPXgA/s#4r Ǝٿ!L;m8d Qr-U9xd68W^e93,UKE" CNͭwu#|2=EbEb'S$ƜZK6aڝr1@]jeD1^H) Łg$ ,DImQ%8Jv_8sz9}("E%F@үea拉;fSGwRFe Uaː R#)hsfveBջvs^gJ@qfS>gfy챚bprv DZ0c?ӵ~s#4N;[[o(<=[M{>a,F;E{!.jaIh4fMl7Oe_03#$3)H#)#*rn77<&}Yڊ1EۈGhbX4E pSHp" >]v(#*2#4^Z" -!{0&WM Y, #4)M#42١ 1WH/uHǘ)ZYVjT|#*"m!mȔ\yvFم΅ ӎSQa 8UZ1XK%T2CXlA$oOGo01B(Y1^.KܜH/~DMxn>\ˆaEh#4/&N+)K]WRWa*C.1:r8Qk`):d62]iVCbve̛!!"aG"]TʍExSBVǃ+dDUzL / 4qrV:vHw@] +>QCT-5$/ߒEqX-ihCEZmIm㘄FƁ,m6uu$M(]L1W#=FϥX:?zS"4J D@4KDUٸ]IS%r845w >.KK(Q>U^{ T0Ϥ]dT y`aٶa>l4sɨZ\#)sm8F\#*MfND7"=/ww[ 6zcsS{_-Sr `UBkH|P^YtW}pѩ8J(ok *(TWċ22U\QSb"S[Np%x܁#*(' k yyYo\Wr+jgBWm|8(]㖡MUcUWw#)[Kզ 1,pH(R`Z198Qfu_ӂߪuXR坅HG$ZD%6l^G#?ΖG"5)}D֗'l N ǡ.N.p eu1 ~%WDF 8ԏ6}9>U ҺecyBt/'( j<¬4|(qors)6FASq8E/=u7#a]NEm-#*7Udw淣`|Uj7W-`|,~Nz+~#enI wwq|K<NX|}): hq93o#*sǾ2QF!:M}|An )L˕ɬ0w E;oer+nB<ֻMo>{TbHB av2yC#)5< #*$4}}9Ь |_ 0&jvZ6+ZlI+BP+:Qs-=֩O On0qyߕ`&]#4U3N 8ݷ=Be uUżGl Z^&#)kŠ eN|C|XAC]i{d$~N؏vȨ z8s^ O`+vR^ Kzȷq~$ v} V f bK,!R z#*"#)ma-lQ1%5.9YܡS^,::BrTn@Rϸ2+'itYnH6-U ܂WZSnۺ*Oǽ!Gx5eo7 C0@\ 4E)+7=kqB B A7 \յTzh.&|Ĩ LA8gSk~1TSpzo_8͓Uc IO=!UrTxF/NN<z#*xyIm,}|= ,;0FyCi:dG\E o"=̽T'G_A։31In*&~M)I8X<ޏ:Cل H-=eG1,##.4z3!zq- EP{61FX@s52Ğjq jRE$M K,嬰fo&x]hm\j愂bkuG]T0ܘ #*46,HP]PNiZ@ȿvVQWz0;S̽ +#4*&R76UC G;qpլY(qwQäVU]sbvnsۗ-;mE8$2#VH"Zx#4_S7(8D+&F`_!܌Ŏ7%w5_ijKƍ>;t@. w;[՛:T5#4l&m;&c>;g] kM;3mf%gsih]=yd;#4FeIWEb`.,E9"=V|װLVli?^w !Q쪭g}@b.!R{dm(o<p)u4Xq)K|2bzJ+β#7QxvM_ )ő3ϷwK%Zd@fjD> H0Y\(lvaW,-ӖKy ՝%T#4NcQcFƁir26g#T{ӄFxew:Ia#)nrwKo zDՇOy*Lߢ_#4.=c%;Јo hxX#4VU`c٫9)|(A[Lh* wk68@_Uw::kp*r #)´#*Ө$BcFX&aka#4y#)C#4/pB:e<H} :#)^!_1·+Lv0Bx@C^IǸHvY:/ Ȟ<B=8V>3U<dX,#4ɜQL:<X妪qr)l\o5tQOE<^Jm!eH/';*F# f }wܙ"3Dzy%Y6L5y6]1=( `tM7n7y/U:5@yna`lg +w2"%,/#41fÕ] <l -ȍ˖]g4Mͨ;{Iw:]Q *#4 ^ݩAֹYX P; %T1Wgآ#-Ưq9^&" .C =-WU* +˦\nK4䬕埜QԜ &D2.c+1)Dx$-X8l>GϜ7!*9#)CZ/:v8'\c ƻwz xBn*惞$#,>#(9ukad*#49Ql !B]y+2өGko| ^#4iۓ )]t,s4H*GjN3_%,#4P,(}X7_r?^;Kھᕆ)gu{m~CfWׁy{糝Ow>?NgY2]D(xmf8G Q do ͞jٱ+ ɑ^iLB|ip6-ɚ%;$ KBu%;:t:x+;]F/n\7[8_oۡ@8 ߽_!$<&bG;'D?]˷_Frxk?Q#*zBa|#)';$4 ;x CgL CĹ& _|zi͇apit2/߰$#)嵊jXfso18+[ 7)M#*fDĻBA&#VҔ8gcEbt1G;(0Qr1 9gyٝ|{k On T;M!wWZܨ;y8 ` >j QY{tҵƣ?h1͠?Dnw)vh3e4#*@;7pmQ *.duNh2GJ}b]$o4<!Sdfbykr[* =wmt+!#sRSnܘ!ۅCgQf#mڏ*@ǰ@Z_ѫ#Uxs..Gt=&m鵑X fp<yj o^#*2J` ʝ$rF|.om DmI*RIҶ֣R#*lNfH߬;ڱ)on[GAa8$,ԯ9TG##*''~pMXS'owqc_pL-Γբ4x l#)<izU?#4XBKj NF%'#4uV^phO.74)i2E̚1C 3O629D&O#s<~FJ`pnq8ЫC<jv"̬\#4:}2m[!D`?,H?3#))Hir%#*⺂ W?_pX2ۥ%)k#*'RI[CF>$UM g'I@hC\z:#4/$#*f0J$Va|X?[E1ӀCuv#)y Ȫ~w{nK% K4y;-ɦ$ShN!w3x ؽ |qɬG'_%yr__F0qgJ H B`*k7t<ThNՀPfwq6sq<_+s䝕W+l1:%o#)4 fƇ"&2y7GW^o+ު0Pv7ه\4;PǓ=H^$D- fh|̩,vZ2(3f6Ǻ#)!td{seN낰O3FBϾC+]XPɉ.đ};u/0,UahaX2B[݇r̲͚r| _~,R:C*<"U4Rh\fKAK|3H.TUü33m){3(--V#4EVpmbPבd3߯l}KˀD' 2e}&[cBiaY^&SiAHRSz|?OwjX{Ék]ǾŠJ2lri(b9#[.TD?1v<c ÊB?>~@*_jӭg B~(nM>k9p3 ֔N뎓~۽ bTQ;XaqI>wrѴNSV)Z<:> _ .{q5uu^_~=^9媷VCu/n M Z/ᰵ}j}{|7f6ɖMI:$|{|\^X y#*:''oYj_y=Co_\9@W9Br8H$ń M_ yyA~ ][ sl,Ƨ}Onv #)7X"YH|Ix@4G|Aq<lGqF A@lLh^ ^+xbjXū!R1š?jFYdŋ:gS\*7L iEloh ,X! I}WD⏸W+`NN"> 2^ml],G$Em\u c%š;HfN=U BvNr(?D6y# A_^aa#)nČ' 7uͪ}ER ߝ*;O?+O| 9gkVY \+΄b;za,J#F+i=J&( ;s>^-@|cA(n hˣƿ*Jw'{ |TlΏ#pSYnӺ= , $X=ٝ1(P>M9`'^w#4'>; #4h ٰ.S=RT H#* 7QdP$6^}A-) 6'_co?l>YI/߾Aq+=8#)a`$ (XX%={+gE+P/y26/5|HFwt1hMV" 'Ko#ed(C敠s"0%7S+%l*$[b'|)K"I0QBxԻB/mV7 zoGγgO?߃`Y$ a#*w>wgw""[jJ;]H xe6F,!FD̿7Z@ݕh?Fz%D@q{vg+#*õ~6zs#4%hZl&cwwT헞#4&`S nUwXASͲᤇǛD:L CVkn\99GCJ#4bՏ i|: hܬ#4楪 Oy \2osQl&A]Eսz`0#)x$7)] #)&e_kJ?ye;G4e/=׀_S#4iGϐbr h^{U#43~Q\J>Bi+b@Lci mA9[\9#)w*O}]JDp+xBL%!.V%{ݜ˙pYB9HZ¿ }#DiNKң@d8^E8H3֯~F#4Hb9 w| e]';g &(P+4V TeCM䝠4PSa!L}82 _~6;Nje ;㝒ˠU"-]F"jEl%o F6TU&n#4H$3 W%Z'*&i N Xǻ,Z ږVx諷_#'\Xgl4b<>H)1NeN!V&vpRȫ,VGm#NTeUQݠknL7}Niy>I3N>*Y59g;&^f~ sU4ȋ`f 4pql֙W vSp AXw\blx<ir}#*6I5qa$Q̆C[F> *&Z/ ^\74JGx]4jo_p *Ǘnȑ | PtO @zi0 .Bַm$Q 5g櫮~mm\(<Ӫ gM1FqMCDvy6inWmlLvDdAtLgk rP5nAͦWjӝ*T#*TG$ 0`hފza$z@yC4ŸmU0Kkj, <]Z6k[#*Ŷ FF9m<d") _Hn[E7$IpzTq|q۷GhBgO#)،` UIp߽W6W| {}zI-:$TWg6.*Q \ BV5eXpE6S`;z] J~VҘ8KK6f$#)Նha#)q{~mO' ݳe* lS"qN%pttxP{v4l#*]c[ ux:`S@[&Mmm`㐯) s2$hfNX g *. liw.7b} 3,``J0luA^^_ep"惿 gp|s#*Ƨaml9ٱ9e7="Z" :UMxƼ #*S (Ț;,ڳU'/ u(>ElIs*DLtou[VXi~ a8&|q~>Xb(ڗk o~-Zxhl<WIܖ]}|㖐d:|-!.V4 a\ X{ &CxN#*_6uhqĉ#g;hb@BA XlM [`#4 R _xj(a1w6 \ /8m>a3DO *H yK2 #)w<3jGF!dluddC<Vqڹa9uA =>2?"XV? I nOttj Z.G!:1 PwDf˺3 Nm)ƿZ ť\)1,c<ΎQ~ъ0z]tbm҅<OmZ>4 v?t>4'ee}z8GOiSՠ Ys䝶ϓ89wKy -([iSWũM7{_c RڊXΪDݝSTXQT7EsS oJSO$ iY\+^zG#4*nITU?ky^ '!hTU ؔ^|GGdI"L=ך$ͣ C1}| G0뢃{% %H| #)uEK{e5=!h+FV5/X D8.(4`jb<{#*vHq-OElʦT cSڑnL>#*V %Pb8' LZ1j#` }oy>JP( L<9B-5*8]EI˧Ϟ}1[[r:pG5̉p#4k$nOFtI%Q~y4ǧS#4&X|<8VlKac{us 4 E#)f#*ze76{^ bI3pܐ#47yԋ$:j2+%\+8a#4b+yX~}}`o$WwbHoшި'w1pH ݽJT,)+X$QOAP2}' NDyncN&/U%#4! DUFG 斮YEN2<aʺ|u`3#4n_]-O D͈7#4wIƲz@>Ӗ].V#*o *8Pf!ݕ ώ3+2@~gv.pP v}l`t8; .d<W2&5JtFu]) gLeWh#*cYN)=h0 |Ϻx:W_q/n{_LYI/|7}v|gwt֒ rԥ"GR.[Yv,p* rE3r~5j@X#*=2V#Hѫ&W TѻwN: ;e`) Gb 36mDŽw]XXK<"T>=:Y{8#)բ&xYPj04B%-}#)XMCA0R4ojz瀚ܗVC#4*+8xszq8pIA4N2+ woqx8F#42)HXuZF7EG2&iEsCoTugŸ ϛ&̤N a[PYҢ BVF%l eI-9S_Mv[@55KhkjU]7C5C\ݭ&ӷǾ*0p&{ƵпuW'hc{ U{AVINjr2fJБP6Jݻ7/݇#4+ҁ_߇V9n$GĢ' F$9ݑnd1C>qqlEso%r}ƻPșm DI;(0:nw>݈ !;= i ~BWK66Z>,CP;<rihp]!^1s,-*qN&ly{zዯ##*ٿAmx=2O#)])v#4maE|&k#4A5\hhx 5$`3H ~#}C<%H)TmvH}ٸm@_hg _h֢".Gϯ#)J掲مq.⿾ڙLP#4XrmuU+ x'`0 m!+QIu`ͳLJfl#4]3Y Tś6=UKص*9Q~=*wa=ɓ;<X5Dj} Rj/8HI/-Iw#)FL''}FQAۛ~ c? :kv4.єy6<fuayם6{lw 6{bsUz!d?PׇAL\ ߛN`~'W~wB.2`Fޛ`E}S7w! H#*Яeoڃ go9y-_ k"0˦sO!< }cֿøyކSŰX^ 49 ?#lKb&=@/ 15:ViAb ͽ.`DSx8XU6g8W6fy |FsTާ0S91|#: Bhk&g~3G> K Q',k~7`tA QsDĈ_7!/_Ԁ5 cM<xާA߳ FE6mNg=H?#*M1`G&"^nG?9B'c #4$g[pИUsڝaOM0Nj Э98C -y<#)/d%3|x#)l#)՜M{~3|Ԙ%:K-ug},`M\gp3(-x|A/?5s _o ?ZLxđ Bs(GSWu~_A@=v}7!Mƈu Qt{Ib=#)zϷz4T[ߜe&͛ -7.7 ǣ)Ja>5y3wq#4ܱ7*!tt_H1A\vl.aRn#)}wgv<W<=nEgOQ9mԇ8ϟ ۠KGv8n!M2lDo#iC)NX*]MJeaS&`4`B:Ru9-|J{k8#*gX 4B';[`1r|Z*јb ކ M&a >K}[ = VzW$1 }<6F +hLzsTzB `xڮMS"p׃dt/UDk@7Hh4z~\ku8Îz"n[| pNIBwxы_ Ɠ4Y(Q)<ܨX;sWĪhV)+җYW~H#)hj1OrBHk1h#Z&ƮwTg$[⻣/.jȾؔ!6*C_; W]Q+̀`p#4_Ab{~TCҝJ~ Е(mma; xzTU2eGI؟;n{#)YsM"3 e}#4 sMp&KnX-9kbgPmZoaNDǥAqyW2Ą# gQ.J4$ fK6agsoh<p~ػ҅joҨ8x#4Ŏ&v[aNxjW?0um9 \ IysB\TWޠԽ|#^aDŘg0PzO @@Id)C& y+[!E l4lmmOYrҜ7`7!_pʆ$z#*:s&[_'Y_IOWc G ҆%$k.R̐wjK) τzQ]:n*+breu%W^1?%SiE) Ui_KQk?=5Yim8T6Oil)ϧUy#4%j20ZwVq-vt;Nee ^LH ]wx,?J^v`eZ3 uM&5.< cilxq &^/shxN#* E6x6b-.^@/F#4v//E>Eb̪wz|<8ZjZ-tpUQTqf cѕ5nU-76f% Ќ߬,`ͽtJ˼Ac3O=wNL/{"_Ͳi6~_;o?xrͳOvp:9vЛM xoI瓓×f(@~*ݫUR~R#4`R]* ln5(h;b_=eaNjI(XTִE Vģ dladr01Kt<L> 2&̗a ϛqN7> N"q|L"wH,8/B3 䨢*5nЁBw.'5h&Y rKUNXY$9߯_2Uw* j\xƁ.Z''m[injZ VsZ{l(x'}?| LHpA /ڠb̪#O"q\zJ,W6~k;hiJhidUJ,{D^ia#47IOAg,= N}mV#)KJs- [e6h.JwnD4\ OTz|A6J=SHWa)>RߨJJ]ғtx 8 <k"0wa,4@FtBPCtH*GC]}qrynP$p-Z&d A{۪nh*tn&iJqi 6)vqS^:`;Yg'=nUs~ (Y6*vF`%:knSW;uEv819?~csM ?EkvTm:W?a 8+ZkeuU}p=2K] ̆HpF^Uˌ`u(#)n^tZR|jWYοiqcmT'цqzI Sjyy+pͻ`t/BS%U+Tb93tJ>F%{$<ii:Lס\xVv ;zG&ۢ,gV{ɿGN gO$1';Zy X]wFp+~biƗظ#~ջ(FN NV9)-֯q>k'WIsx;rtIL: -Wz]R9-rBIpRelyPxjIKDPRYIH'+:QbݸpEHEwbE?[_D)ćW.H m O䖿%ٔ l'8Q9ȣ%F!ʲ۱pu35$9<4,SNylD~C^PpzZ-?i '"[H fr o'[q,vT4,l9.NI$gM5w?Su ̲t;g5.:JΏaVu+NkfoDt䟀 >-;A#hLlF{ eB7hqDک6czf r9,'̗;X#*zԎ۲>ݶe R he dwrbaQC#4#f)p$@/vGgns<V+X:n|oP]qmec4)f+$((5#* |+n jT#*tOU A z XU ,IzBdI[Zy/Ƌ;^Jw <:C!*D|V+*-ڽx&~k>_?kwam4xyAq <+/ ueIqE8Lyg ?-k{@UQ7zZR8y'`x A̐myBbR[*ygEB =:u 7;G=thI/{@S&nm'$hprP9<nl#4qh\*UVFv4ӣΛGG!aO'-}{K(@9v5}iϮ46 4jP GhG;р&U|tpC:8,ƿ`?Lf as8pN O?w y/{x$VpÈKIE[tPE|R_:#ALϋA.U8%[( gqoaKސ#4A ~&iԩvյ &OojSXg]WΑ);,f4BO>AAD| >ƛQ|2 >y?(*E5#ǧ ÿ?{i: `hө mҦzy'c͢lا=ݘE<J'Ig5~v "M?8o"1ka+k_ Z?B띷J+6zAXhx]4۬Lي.&mMSd9{gyw(j7{ٟdf#8˚"TM(b}ֆ DWhZ<I1\*BZvZ?AޤE,EIl^첤[:/ɱdMUL[kv 80p m"V ]s#*Y5-/]1q:{`'0$oLA2ko^٬5Q 'A 75vzwy{؍5~Txqyf6ud['9 yM vpC~gwz#4QߍGtBeH/3i+fK5Ωw}GB N6ch<5 1lf?ӾY+:iXPqpYڂF&֓a#u@s QS VÓ_@VR(rߪ|+K ?Eޖ#B<pXr`ƜkV'Lxg-dNV=*#*̀79KJ/%83K l>c)a.ٍ"8ey64Kc3$K鮅Rg\Yd%=foθ$)ԩLPnqF RhL PBfKaXF)|~TB:[(C6A2k^tgc3a܇`#)孔-}ZI]r#*Qƺ-rnBՃ L0ʜ)N$iI;љ`T- <a)al6ؓAJl)HD &EN&SX_ש_K>=SUR'ⶕ}IBc|E#).fZXCe#4#c+e #*!2AB tt . ߰HM6į;&B>$Cu#)qo!]늢hc.>I%dyC O_,n5/:{c#Q8L5o bJ1Dﻃ z6_xw\#*+@Mb&bшM} 콎2ʅo8̄}\Ȧ"r C .bhۋ8*q`o6٩?LfWpF`DN&zx 3S3!IBO0^"#*A,}LٴeFHǵ<l 2b<+D'#4/#)Z})%b0Ch#4&F~{.d<TF,#)KHIYAF<%@~w5D曎Hz|S -FE#4W˓%Q܄OM=Eq{LB%31_g䨰g_ r&R>u*=5 E˗QE?{Ƒ#*#*b.h ;g `] <#)ZHX<[ o{{m_i|vnL}07 #4 @F hq QU}Jn:oL(<ONW#GuħU7fuf4, ѬUuyqr+#*3z#4]rJYPwc}]ۉzzt\*=?;%Ow#*';焕Bg/24/ywYE-Um;^d/w~.SP];asqI`¨8//O$R;m~~>ÇGζ-Y嫃}Y"J 4h %B }~|q!H@5_I"P \'o2#4|e,{aRҐFwȟ*ibV)-! ia pp:Ą:;9&#*a5w3G^yl!6+5qu\ɓ*ݮ> 9-'.!|Q}}B G糐g`vR#*F{kFQ|ƈ&M_=[qُB {IP|2=gc '4Wb]W#4ۦ'6[Ҏg7Q-ͨ\ЅgECHM. A}26dLƨ{<vN.<Z\3q!ku]P-$W<c;jƊBj;W -0^ nڃE*^+V>SmZze &=8I] p`w8nuN Bj6x'PrM#wm$bb#*hw }4ѵP!T`?>o=~^#41c_9;N{N,R n[у\b)N4rԾDw"grVXtW+i tt>>Kgzx$Np"u^Xh0Px3O\\?Ύ_ q'u wy>#)_Mp=/;<w:v,)a5BHʈ=, 뼑%|z'ԉ~"V{i7#n`0.z)i}BEzr<=m|E}]_2w,Я {ǝ<@5?tpI 'B Ys#*:#)Gw,)Χn};DJ]JO'W?A_yB8#kj4zNa8sGdG&uN<H: í8'ryY6%#)a؟ F+%22&BsCúky%d:N)P Pm`+rP#)ut 5Ucє0;@ﶢrAd:p zԢ'5 Xl>(Ž#&7 #4}kMg}twjPѽ,3]Mdp ?Hݯ+MWTtDSָ|QID*)82]`,( &0:.B 3 ښ{$ǽt,XDovI#*t#4 #+e<>gV qd`@W"ꊏj*2;9bkkb fmը1j(ἶ%qBVpH1kʰS}oU<OTFRB ̩E#4M"ه,S7Ґ ZBs䌚r^#)Ԓo(gIfL%1OT[%GBwvvهWn!~e=,vO>ElIh/& I|$8fs ѳMq$+Qg%V;aNM>pܛ#O^\!eGVk)mg*&]4\5Qe$,% 1 +SzR.֨eRΫ\'NnOw]O lMb?%u˚PPqju{$7{5#)&d|.e$.Y)u`&)IqW c:ěP#)'>?"ߺQ u,}՜PvΩy:J; `:. $/ {(]CuV^XTUuh :(ScW JiOwp@67}<ـ?_??./bߐ҄ |)aȗ+*yb_'oo`&_F9B2Yx{ uaIZߊ'?Lᎀ} 31zVX :>B;;e}jN}!| uwv#+=]zPP |Qҏ$1Y1~R}}tVR2P$~>E#*D2,>#*/wreS}aHÿlt1KuM6~i;#4iNJ?~ߣ_/? e*#)?> vXTj\5PrwLpϒ^;KBC" l;E#)rl%:&d##)9~ʫa;~.tI}r*7G"$؞Bk#*e>?іRh r/ >ׯMNnY%ּC-R&]foah3fpe(Ԫ'*LnTU=H]Rя/VӄgTrRQɉ1P&gB ?5w]J~.?YǍtBϒ0\Yq>E@Wg?, (d#*Hޅ'q|:Ig!?k?MB_}1VSvz~F/(,MԯbwLVʁ͂4GlfyZGLJEԌ t)}A@ N߭FRH9_ƺ76O'vX#4 "ȂufNuB%xȫGb#)=vz}[|}Ҩ~sԢ|#4!zBK+zC,[BUٌUyh7U+lmF3#4j U*tԡYm] y"_B#*h ӓ"MyFcgg /p3~.&cD&h `aW<a 2~$7V0ַ#4yfZ6Hp\g ̯`DY`+Ysw2-^hZ-E0K)OD= 3-[=!:ڂ#Ɣ7k"i/b l`ZgYHiɔ1>Y¤zM#)Gw<=L j Ȃ FϒGO%!e<fe܌^њd]% c,- 1A<7*}T-{:~QK)Bm9sZ@^>ap@3eTCf0EZ%n*wsq_iĽ#*l$EIbhOX {i#Gڐ š!nsX eJLW -QGԝ%n uSQE7]mf 9ej~^Hԑ]zsv !VjOfyԨq`ZI?p2b7OW$2z< ek5+-c=bkf 39u˓S>Aa'?=0:8oL ^Nj>M?Nnލ2Һ "D6#4_#4$o-S!.,F0Ƣegr_lOh ;tm }, 8#Yh%]%zI-uyA,*"Fes#4Ƭ{Sg˒\bkNrRA d3Z b,#ʧ縦=WsR#4&s\^ W{7D > @V3嗋gye89`<<H-B =OO#);wWB.{u8g`(%ޣ[H|i"M #4Q]ul2(@wh ]~Mjhn>߹3\B0MH+tYAo+: &55Y0r,Y6Z7T%00l&,SڬYt#6,GzNH4HVM!87ꣀjbvp[Ր cE`OI~MaHnjOq{G5zĻS' ϗ*yn9&N MDzBL+r&#) ,쩨J#^r|t{ xʵո*guQc!٪aUMJfE .^ M{]]OI/ػ^&z\3{ AˣuxP 2e=Z#*(02ܻlӨQ#4 Y$Í == `?7 ^*qN>&ңͭfXe+wE"2y6+]" mX є z gvP*Fv'W|uҤ3|klItJ.v 92j(?o% ,{gh5KU8Y>-92c sjrmkr]ZTvhp]jӂZUtTdA%.p}m:.Nٵ:M.K/N[^>qv˓Pu:yQ5+ӱ#4}?$o$sr{T6:s[;mPA̽3^E&4tsvyI~4ezema ӓ ~)l=(?09ns4+"HK:GL N w5k ̢=-#)iQ'[Î1,+MKvO,J{$ܬޒG - ;2Ȝ"UD誤≙S I3A\xX|$=[\D l8 * u5Gcc3+D dBwlʺ*O<Q<#3ZK mҽ/4CKc ǒr]-C 'ɇб0 K_疘f$gJlt>I}h#*7Zcs/ͷo~݈jz oď>W}^y=4H$ӐQu/`cThfx *X5Yoڝa9E٧=MD eFAsL[#m6@+=ioúz'K;'B q,n_w;/#4f)m~Cٳ9`vK{I@ZIJYeg:zl#Q#*I3^u#& -Oj[[""ܬYyۡ} X 2:It ?Z^䨸5 }}} H4Svk%Gߐ"c~C EVrZ%#*!=UU;O = cxo4`Jch@Q 鹈KK (JZ#* m56}aj>4WSUoǮd3NkDp5As+3y#4n+f)gǔ@ɣx87/cẸ-^i.tߛapi$>a3L"Qʻݎyu/ƾ6u>Ȭnl:+>t;GD @FbΛC|.iu=dmpu#4E<CPUh W SbN#4 FQ٥7x.1lJ']^O\!M f~s'B|NdO#4>G` zy^y5} R3gJ`Bk \<6W6aBƩY ?cj%!.=<||9qeM>G˄>f{鮭3<%ϬW#4h]k،R6#_Z#)P/Nm#)ŕ:RpjŪ#*㣔Yxְ"ZjTE}?K|z8Fi moѽnQ';GkTJG;/UE^^:؟#* %j;s!p}=BKR#T~9~&J 4 AӾ7ܡ^jKwH#* k>< D4=L5Dٵ-b#4)0h[\\ -4<Mɰ,GZR~An$KD+jBDuD+R<c R7,YLs1#*Ă&Wj4q7t UQ {!i悱|Z*xk@ަ% E2`8y;#EvICeWn~}yݷ_#*0Y˖f~vrzuŽs^ tt/l #4iaOs=* ru>ڏȘ0=6r鷏 ]_?ʐA@ĒI2a ==~^kk!4#k#*% KIvo~džz XuF O f av L4YEH&~ Nm7#*Ĥnc(<0zx yD>X7l] ~&-/kA9n>j0}FWUK:d-M_v}f}\oa"- MBC{< `OXPKA#4J:j;ʃCڟ 9:VeVyLY:""K`{Ilulcטu|_[#iQ! E2_D&T? Z&9ҏhJjbgi|#<M8wK'a-nﱭpf8igݺ # 5)%妅M*ڒDP`q _%I4VfZh5czּ,d3/$8N/ W/տݕ"i\8_F Vgk,$#4sM"/*!)E ?!~ PKmJ,e?^n٬#cW:*|ֳ`}XvcίJ'$ ߱ߏ]{ r9S 8I,10)K-&ґӺH[#W A> ȃ}Bo 51@i-L`%?)!#45/\Fmj+:AbGԩst,Zq,VV#)o^ m[6:~å4WT$,2zNgLAN.ksk~ *Cf8hְ$.~"]GB*_${_?f2UBy7#)A`٬#*88?PP ^% b'(-s_C|E ?~x?Ky+Gddee<k 5 ?HfkZ+Jج~j?$Y3H sfk NomET<DD_ W@}|rd/#*ST Fb'i.ABfaAk7t\c=L5ۂz&Kg/ia7+z7 H.n:ʩ.Mf6D#*QzX|BZ/a4U!/?`AB;cY7z{djovjk )7;'7j^nؒ,*ab,Q3A \Qok&بQt +ֆcM`Z R}@;ư>ar#Τd)i1M4QwVՙR #)TܳԱ:,N<MnƭLaa`AN#*ڒאJWK2P@4m¥厪 bWɯ <= ? 8i^W_7쪟.[@7{PA<Gr!.s-m+Bp<@FNwNZg{/YBw_dXs#*H1)#*P]H)@C{'N+p=f@2C26A+iXV 8cyJWi(#J4en=!h9-Bj}`έD Pt{Gt<#4oL`y+or8r :hb``(mo#)p֤^Vch3)[ȁy\ 6 kM"zMOAYi)#*m O109 Zb^/YW[ ЋLXIÎ"DR5)9T*5=k@̇3"-`r*+L=d#)!`-O;iuʂ:bHj654Af~{v Fг\њ "Mk/=9YZXn&u3qv_p mQGK[Ly[}*R)vBab]{taTnUM9;`4Ob"_}@j.>,@bqP[#)vk] jg=mz[\$Xsս :*,ΤdZVT#*2:$fGNkL+#PV 3#E ai2pddܧ$־'`OO,M,ڎdUL߉`plF18! BN-M#,FYNP||oͲ)|l/cҀ,M2.O^,%V * IE$|AuhM hc?68#* kVT]/U&N4)Vք* UrVxE{v7,n@C/·5Z N6MtOWvi{ܺhvnUDfn46N_.gc>)¥4P[i m7nN9K;I/:G8y)! ԄnpUk`z 4ͦr膗,M;oLe0 D ]WW߇|Q#*v\jqږp3?I|Ėu[U6\ qZʲ;y7Ǫ8"07/ iěԭp&/x#4#*. ]mr ܣ8HYNQf.G7;M3;ס٤%d0u*"n|i_ZqV! %Gv=l &IjbƳ G$ :M{c.0Csp7sZBsag#u; qk 1:.iܲj28cѸ7@[3iCO nJh4NKk OY]w[x8#4d䪍E_>\톫5*eH`` ǎҢE%(3 aEE*(? OvUxWՏdEM9zuY|έMvɗ'qa)z}6 ylf9D0A#4 $ g#)U-$qk(($K)axSC]j>݀nTjf[1 L > B33H`d#4p $/Y90*+Jr_iY]3wxyχNp.U&JqX ڗmJgIMUJ8:KW|MM; W)I1Q ο[dr_k}zq +jŴp:)@[e!AGV9 0ZnoWď|CwhߣǏ7|A rp ^!у} )v#^w l#4߷fc Į8=zuZIuBX#*ۉ .]ˣy XCK"s;u)f _FriMD{eƥQu7/'W&Z:&#*B:ԉj+/q rLir%N}Ga gR8I@֡Q&"?%: Q9#) tNʳTl3l` kHYmo,YLB=&͡0i( ]94UqOѺa$̒ L#A*0C@! GHo^SUhH /o_S2 u H vH)hX5njur)]w,tyB\09/ `w_ڹ#[bWywm۱#4@Yi[0sV">,/I!͋!ѵ ~cᬩm͋xf.L&۴FF(pnҨC"j/w[^OJŷ {'i\q qIRםMm:^cٌۮKRddrXh~qk1~^绉ķ Bydw5"]DW xsnǪx"+9DvTIф+#)BT9O<&(깣o퉥_s[II/Uկ$s,{362d#4+y$Ӱ=U씅8 #4/ 8X\%CN~b )M{лH<`< boДPbHP9S?S|VCRMwN>*i),Ԝ aYc<8@ ӵXI 7aTڛR'4#*rN3.Lu+:*=#)ʤD_1M]2v:̬\U3h$qdMHٜr93g&o˩(3]V& Ԟs|Ff &ȋ9CeW%[;r "Ϋmn k(ttg>Q R@- :-=J46+aVX#*Ԫ#)㙲k:!gbaZ6sj.!LFL ;?88, GH_NE$YPC`Һk,G!#mb5 0Mg(RrW 圴#4Rnj.^~\&3!Ћa ,C6W+fiwq5h Q#4;B瞾%ٵr'[Qmz m#A͍f[I?K̞jreߓ☙z FZ6u+8OV8Pbݹ"ZZwة>mBRb\-3ct;i㼻A֨ݹn_IN VY֕SS+ɡ72Ir86 >V-?FxN \hE<]Dʟv*KMtIeie DJ22p)nyp Ai#ihogjh}n,?Wy{h6#ݣ1)8O:$Zg,,GWT-S>JԔt]#*k?ē4ucxRjiʭYUwڜ([mLK-R2c{Č~:z "#* #*_#ьCk6ل۔QP |s{a #4wD>W;uYI˵0ϯִ'#*]l]uUe8% .M6S<:)a?i%G˔{6/8p4~!!#4rß`\1y]b݄ Ml/nUkŴ4n o&4ƂyIQE˾*4#*R(.[IzA۬Běk|n>R8gW<|`k]A $¤2Ni>"B7,CGN3xԋ̢Y TCXkG#4[bmE7#vZ ZtHzʃoFJAp &MT#*[O8g8YKSOoڰj&Ѫ ]]NNص;L3Ak' d&3v>)4_$kQ#*FW ]+*pm4o^S?~ۛz-%4w#4 #*39#*QSb&ޘwMIGy1I XPY7ܻ,m W*t+`_5S``bv@,a?m~'rx no :7!=<k&YPO$V<A[B8#*^\mU:Q*}U1\Q}~{K =yUKgYȰ #4)D[{,IʠXwP!_j VM6ՍAN D6 oVŞlӁeUM <-SP ]s<,lY6a4I{3ؽJ(Hj%ӄ 9/*1C29]z &]Ә:)ҏׯbp! |"XߖWh4t?;9LBsl:L)FGͻ;%_p rejVφa1DjZ#4#4<h!Ϊ`#*?nw?<xKmCv ^v[v >>Ks=vh[iwU T7YbJw nJw?os?]hw1ף x4̯DZy%#)8O675XZ-sS^[R++q@ex #4UrULGO\gi-+5 ~~9:|l#4eci : CO[{/O^l$`֜=A#4f֪&5oj_\6*V/wNZgG-- 3jV+18|E!Z ]#43h ?L'&xNL( `1(~ٽ=_7kjGk͋_d!0\+HS7I#)PßO_ ~utzyt#4=?OAϸ ]$9|MApp+|lwZ;ǯhf[J?H[ =mIkMo7a #4_L?jS0b 7O7J8ӍodGLPh. \%anS[%[/~0!W}E_? PK;)"gg!AZ,~X {3q&(NcE# #+ao߆ñ]GKb\Kr p56 y)L9-Y 5죻{ڣ!\F-gJSqR*u eq!>3Tr09#TnG[MV{_gp?CL %x( mNx8ȝLtTyM#*,$C+P˚, oNH T0Zp=aimIuh , I.jzܧ_GaS4g,{ ѽeS2;r#4v%ǖg+qWQ V.m+*MIv~dFzyVAz-Ssq~m;u{OS7geWZv}1nߤp˭)v5Tw#4鬬O/ ƤZM7!'kՉ}ZLZ=ND'sbjEILOg6QYͲVnz1hQlN \Q_=&;93|hb" ?0: 3=z>E폮bi k| AiP_. YI 4$2ʿp)D :hW5u#U/)XLٝ[j #)y127P$vS) i¦wn+gg?^]Ε; ]_ O| r%4"M`9kOrJLȼrZx3DTX%MTgJ+;]#)l"*WI)4ӒvRw}M> |躎 L%4rS&X斶:60}gZu~`!ypyW_~bi0;w) t<SJXEӒ2,AUKRs]E5 JG,GB4I\U~~a OV,Y?ҾY?v!Z qpk*_Zo ޭ\Yq ?u͘w[l[G64q-d]hMoJ#*ܻitQ:Ȱv`"6Ko2 TM #)%;17(+YG~FFadsܤ@,SNnӯKzfgi<}k:)'&ݔV ckr%ՙU Fm|v#*N,\(Sf6'Z?J̰ 8{hj8 lXP?s#*: m0Ln͔J]7ք@D#4`q /qU/o(^@.ذu(OLqfkȵ4-UU%'}dL/cE~Hjk[oLރj ݖN%bČd T䄈@yj#*CL-2nGmvg/,*y {<^gھ[pq#/붇aFec|mGevmى7{G&Xޅ`mZy:NP%rXgW}gd|.,!d615ln [Y}XFTOőet %判1u%NRm A`l! T1l v9rk%&@f¥ޞuLKs6a|M `6qBZd|Y1}Jgoh}Tv= م0LFr8E/0 aWa_F_ #4`|rLow]Ŀ+@pvq|$f- l~Yzmb`QU Y)2egflCՙD R 1JLlY_!eWҪ NKc\WPk#4`7=JA8%©$!rPoIpnբL0L}d"`wdg綀QnTUtp.qpŁPz'\J D(V+4^Aw3= ߣc\jM3F'Q_͞!2M,,ݵ4?J-#4Wg;}{dCd f+`$,#*@.pҺ2QHklq&I Z{=d@\-}.DfjW "j),,rB`^;/Y /9b&8Tӛф02q EO<+t';ʑ?!= * ̮P1Īɻ`L(ٽZ$ܖ5l6٠MBp ;Cq+0 ,l\UNKCL3#4"WjpDMVBK/kIKr lg3BUxR v@kyS$P$t@Z)hm5#4|!s\N;; T\s<M#4W##45C$._'Ġ@2kmI@Et\@SƦT * x4l܋@}tuRPRqyE/kI+aib#i4H#N{Drp.UF ҀɊqCчJO;]HvXepB*r++jT[pBcL<8h? +Jʡ8SO7- US$ޙ)]1I\ݪm]hīn2n< ,4sex1qW:?K/*aT }/J| n<!ߡH翅祭࿈{(7`Rr=вbYr]vat-ˡ 'U}'f #4n5SFhD |l9#4 !.Uۦٵ{DN#)iU"%g(*sm^Ǻ18nb^ZCyK!}ڪFD:-Z5[BaI`Ye "jޠ `8>y 70#=gJHf`O08>o @WR$xMޝ<,} LDW٬]hй @s?E)c˳?&Baxk`sMNM&uh@M~uY]{#VڏIi`B&m0DaQo0t6+YnݖfE 9 Ry1F ., ^sa&qtm2X#4IjZQ 0K\/*+_SloYDfC%fxp-(14a؞Y#)+OO B5JD0/Q辦j)Ϳ[ gl嵠 f-Л#*N\Ƥ&?H]+I \ ܸ - `dNp#4mښ*zKXMa7ZqFBH"'d^#4"+a_N. G7xk #es0E)P0//6Ob36 UNuP+jN#k s̨<tQKaP^qvF҃4 n#4N riЇk7oIYw 3P[b+b^83frC6f\UWVqBptQ}^|}Ӹ;q0O) WvT~~#&D` /_S:>C˜2ܴ⁔*xdɿBf (9)eR;n5IL#)FG&NYhKP@i$Whg\*ac NE@V3 z:#4_7c)CH+&ei*#4/%i#4VVvւ@tΜuG1Ą;bԝ DwIb2UvYFX攨)`wn;#4[='r|?u#4;aQ+()(N;c{WRbh"ݗhG6xmV38 W,@l$)wQrIkI,P|}uI:>!1(-!<;t!ʐ\-lZ*%mKᖗ] QY=qm`j/_Za1 :#4>Rei}SoK8D_F^gBTAߵ5#*[?try 1:! jA.Q \]`˭`g'O~ RtIg?T 轝d"oGDC@Rl Uȓj DzWf>'-]5´Bvi =̞1rd,mHmB.O#ҁ>>>[0@c_$0yH 3Zigq˳$#\Ke , cya=*u_f'pWB> It lϩM> &'b;{I-?,QC' B lH[60VYDˆ)1keЩK5|Aa4O=>8`-nצs;;Ơ4AREkٌW #4Ⱋ? ɛ#*pvv1&*P] lB^ p?SKO{?C7ue <ϓK~ CP!DxeǗ`۵kϵ ~ z[or^#e8y^c?g)B"@ %A;Ăvʜ:!RX<g쨊<pT;9,;Ѫ |XQta=kW8FlTT6`37jv֙,.ph}ek 59rS>aưml2?6[~AGSNkj8 !E?`5M|tֱz.Oŏ 3y#)J ^Yk}1g1+gt֘(V< f:%4<;RVoЛ OdӘYFz0wǠxw;[?yuzW|u {~D^ ]Bhqz3R5ҿ;C&pԲբ>.Ej;gAA4T/ J%t]`5ie+eSj/T5Y\!|"Y{=2npf5#)Q-.I4&m/z7*Nq(2BpQ!4waSkCg6WeW%c{K~CGQQĄ#*4EBUIۦ8#)enE%/A# WjkC"D,2ꭢ2INGg-XuڃMZA}{H_}0W;;{Tmsd0/GET:/N`J־~?Q|SU_GVLGqvG RbܣAgȨ=#*_P:i:hfbn\IJ_\=sǨ ƅx;/Htij.Gz!#Ch5ãoqGm˛'o+(]@ft;72o#7lY9[TTBG֍=h%@>$'J1tMÛŁ5!(V{6tmkm&6Lcs`~Lo藑֠TQ(R:ʑ^: ҂XGXF-{ͅj#4aC%g*a Zs'r`e5XG^>Jǻ~ ,N8 y&: J#*~#)~CVN!|=1ֱ VʦuQ7_"!ن u lP[sz s´,=ESaP2fuIili jꆱhϞYC~LA@1PX1sE<L NOx n>%> i Xbs1hSh9UV16ի^TN T9Y C}U丧jr` a#)qh=\ڶ`u0#4O"4GKɕD}ul" H yN;9LSWL$k 5Sȏ; w] f"#40 +ݥVhop9 >y/-}P/&UP]~/Ma4h;C MϭF#4ZǛ J%j`ExyFɗȶNS#* τʸfn&s)M#|c 'þ! toyں?9ܒB~{khg 6}#*zD;* Ҿ?5 R:ӣ 0LT+W*Z^RQ3'OŖHj#*]RP#4ϫr|K%=(ص#49`a[sB,^ĭe YQg=fQO~EqpM.8.XHSJ#)ŢSz#ǹ;3%#*)o?{t6 mBhFfїU2 lR5ʪvv^ 1fE`pUB/rR5 Dlҩ2>VȚ`0i.JH'ᚦ1#4KS#4-f:+ yHȰW-:_ΎP넻`nʗG{ HJ!xj/FbSQ(C.#4%RcLDݲ$XUL ĚЙ| T&J}~߹uy]֮s3FE7?? }K=.+m'< 8$6{|]t>ǼZA vFi-cA_f.8#*{?Mz~.9> {܃._A(D5L wR {,V#4ٌH<~DһgN[/D ɔ^o x:(c2|o-K[r ;a$dogtT#F|hlNEN7 pA~xZ&CaerLO(6ʣ?HCN9TvoS'7Q,gB(2Q!0gO.&0gF}BC:;{x#fye~vd=_!+_ݭNN'B7; ;DaR{cE<p]7)Џi}Nƽub~|x\vy)eov5Fw:F:*T w+Ͼ<|UmPWkXOD@Q~#*yUD i#흟(v0.jl?nr[L͵VӆU:*Z]CϫT f *`֭C]VrJD{!0@CdIj0DPW2| LZ XVD^H 摻; eܕYߞ:W<\QTyMlڥI c *8W| bSćB5(tcߕ'#i{?5+,,Cڗ [:UHe\g2 *Q>%b j6`&+;~8ZO{pZ3ء#449;9tLy(ܴ;ܜb5B.JVQیƅlCΧW%[;e݉ ejE` &b'S !$BӛsR>{SR| khq3[Pf$-.)e+ Ա.fK""d_&]#4lSnm5U䀆Y˺1Tvw~i흣ݽャ7:>ywƏ v錣nrW 4B% b^01#4.i4bt0Ͱ/XZ v>cg%ObW=1:ZVd k#)rJpnjR^TŪṓ$+#4!&}EñD+rz:q6 jۻ4:H,̤P0>}A _a)[ f"))_`@DR̚2?'"'clȼ$h4ե A1%8&TSsJ/nygt8i?"K%WuC[1 ZbfR*jRP9EaօZ`t8MRj;->0/\ Vq,h Q">F!qDxWgn\3 l 5':눇3N#4҈Td-^+ә" {l8 JX^=\pzyƳ#4$qջ9c`)˽|toxs]'0H>zEUe [K."²Ӯ8Yx.6!,h!-+p}r[" %7kN \{ Vmڦ/McP&%C q--G#) {Bq| KQ` `pߎ{ӟOv*I !k| 2( 2 "$گvast _a݀Ts[܅ L𨾂=G4a.BoLj_).,'zX owΕ#*bDGwe@,^3dKϚv]ђpZ39p,N0$a]U2"jl=jFe#*Ǐ}.#*<쫙 YL##4^nt&k^H9Jl#*EvZ/GKާQlI'F-[ ZV~t9)i*ɪ~ch;|fBEiA#4m0Hy'5(RtsL<vvޞh-U腫҆ nS6j'=bVd" n"±e/<w{,9 7*vBQ/'үq(FՖeE{YGl6wF0^Xam)Wײqjb]? uE#4?D'7Ҝi=~TbcfKJAMΊ=WaI6;qXmԜI7 [Bܜ@Uodf"-9 ݟ5õFyHPW*o(G=M2;bvwB~CZ)(.*6.*ڏ6HvL/fcZ6 :c0O'VjSa g BPv{E1/tPPgqaծ }DVg1 W"`BЫ7x&][T` ,L$N*N1ݩ0u3=8<: :^@E0DYRg;i\W}vcS7Ơ7^ S'a5(9Tj'lQߗ%v^IBZ[#ćpb0\GgڈA\V&ޣ:p$f\)jZn;+ֹS+p+#4?H7z>M Io(^4Rzl b $c9#*8 G #*sYʅvi1Ci:5; E:]wߔ dN$ỳ}A$ j}#tD)XneA^u^6 0Nݑ'AD膭_SgE;kTW.i H) (Y^ K##'^1}$O,Wt6J;p?vJ>?؏N# E lD6GMɎj.f5,Q:Jzpt;)5/ ;#4#eHoT#*#ᰈs?7ITf ?nXSYL\JV+W|m.n{ŏd$c _@,VVz,vˇ;ieq VHӣpa_}۟%I%O2yJzD< 7`;]:f | ,043F q&@-9Y?)LĶM ʇ'y1ݦu {co""f!Q]Qgjlޘ/_vh"gI@_ 8R#4#4 @p W¼\=41 9pl/v_l1j~3 o˦Ě l1BU;l;#*Lp,Qtp#*<4ov ^zf;6/CAY<!T~.]t@i Y\49YT>Hf#*yCYDSW*{MfdשpAΦ*AG?v >g:rpe 0h'$j\5{#)P^Ykr/ HއPp^ɠᖗ;#*q6ۄTl?]%&JoK и#4Ô S4+ף 9Nqj͖B4#)#4P .yD~r6S9y{`+b05_)=TFW,i&)#*5'Fnboh#4!&=RU/P%r"cP? $l'SԼtCN'{,v#)#4"&mҾEpn;NIgԫ ~$ ; [%iJ$UZNÎblp;|\_nK{Wiblwen#)S#5O1#4LlKr79u#*?nH聯ΩsTNWP՜&ufi4 ߡ.[qM\ɰ>fPeDaEJ7hs)VH[s }ˌ#*dɉ :~t[8h5Tѡ7#*\NVDB7W1Ulwz5dm`|`b O|z+o{C6s S:XfBPL|zAF07YBd/|^`!n^ ij4Y#4:/$~)^(W#*"c1R7n]sz)O+Aٌ#*q&v.XoC4D[V VRK\*#45ɀMBD/p눚b$OL]-k6|u/Rgq>wOv|&?(N5P|Cn_DZfp3^%sJO09u,k:E|7i-Ү4~`{76۴TV_#4߭ks-ZTz\ 47y˼~ oJ3 ZRB!D{r|M$ l(N.! 6kcn&&Tih-`^AO-0"w .h3#)m#).-awX7ypA!. !YD\#*\?Q[TO)݊B$dmMق'P'g#* sYzg8짲tK:I :Ȥb)/ȺLM*_-? XLF9?d2puodwmLBEU5M940iݣ8p FQm#&4vs~Y Zf \"96aj>&3HnjenC ƾU8haX~ɦ7HX}Vt9{ Cs#)=PX#*#_}7l!IHysd__ sοpPK&1/0 lg]An ĖjIEӝNǀ9FÑ 5XlF{p e5 ?#*wæz0 Xzo(G2$\_yk] d#)@oN;"P)O\zj >r"]rT q?v` %x? Js0IsN8~rZ: 9EoVz6 &B@WRPi爼 R, &4JЏK+p:#4^+E"蟺k_{=`H]bf8JNnOK+_ ۙF~:爫YJ:D*%6λ #*WswNU=S1!*\t\-a0-ׇLA\F\SBaRk-P0de՚9m$tV Pu{.#47H2jI%vt6B=ջMX T ;Tmׯ50ϳ3iU92g?f-2jtqg*^|fD>ϏNo Zt/(?8{ye%}b+2?"92ȼ`|Ibp% r}[z#*7͍O~}1W~}3н9@@#ނ"SRMh%+ ʫó=9{sP+8}sz2XfA?vjM 1|{=< 98 @zw]zLƖQ "ʳӻg;$Q F1Yl"C#O)2q@]Kir@/l/#) ;;>#* <=ғ' j \ r}k=[OadH ;_;p`S@ ,OjɪhB2sFPɽاm5 \quqVjBzFƘ)%rC^q8M)i!5;pp0av蔮HY<b-zXR bԏ ~4M2us- ^m1HZMUG5 ʂB!j*Ɓ:a>-/V+fw պ`Esc P v EG46ѴOPm\0A+" ЛB9ׯm^42|}=4{HU{ˋ#)K9#4q#4vp9y#),QԞm` ٖ"EZg#y~?Yox[y!Lt?}]ˏwÐv%&{#4?`M[<ng~cQvgyŧHݳC5XhJSSz? RT.un@۽BGɔq^Lz^zｸq _"GWnoܯFS=ol#*cnU68D!Lf%\yz5'J> -P6Ci^+|$kmM)<EٯMUMOhn!9{ rP |E76ܲ,F |V@ZL{ Im5TOe_xDte#*#v2N S$Sே0Gwj9$ٸskU9sNxmW>PqEtpGbч1OZ $xIjOj H|T҉=H)?DwOgGm"+7 S^݃ym \Òv z Kv G^&ۥϏһnLZdJr(ffRW]"rG5-3+&F_ [39`u͍ hKmuvAQ` ${6[f!7yiͬ0\+tDV%ВP08P^"=VB4[{EGM{$AȉϿ=ة9 HJP,s.\ys.X#4'JQWL,L(4):NT^4k0&<ApW{i#y^MfeI#)Vx"Kc2=^y66Ro} {۷t椳+G#44扝aݿOPZs?~8K#GEg߇}n5K85&6 {':#*`IپmO!^"n|´Pj EMrߣhes|ܺtcݰv[Zzձ!(D"0;BVްi%s<jݮ._uTmAEd IX nqqFf %<" ju Ԟs+mqQj*|_ձ A#ؔ s -z#42CtÕ"#)H F=Q#)E;äUU2dIa#) vK o%!gtT5s}Q#4a=`KipY9J;U*UɁK*[&!%H axQ @k@:ʗYgjcn" eA{m<|]AWK1 F[,NT})1#4; 7A,t?AcNn:T r aNgо v+Yo)JH%/I#*p&s?4hZbgk;[wK{u>RN\#QX چGhwɍcqet' j[Ȯȱ)kQ\?Agt76Thg kQM(r'1O<3w3Wm/ }f '62O7'a}:[]YoB.\l ?g {E!HM4#G}73Tx}"],DsKk~ 71qJ֤+rï &=7> x%</Q ڗ}]2Ktڞ̋ϹE\K^?I S(L-̏|yܘ)ºH}-q:gcc40iB*?VwXr#4d.XR% ݏ[/": s/ 3Ocuhς!!Ϙ#4v'Iuo0+rc#Pvk:jGx:An#*ʅѵʒsx8<fVb# M0Zxe{3 | ՋaҎ#*D*z%4i$i\! χo??(ŢMK#)-,.A$=oU!QMRi3s]q K] ),u{nnSQ`_'H)NHS {m:^-( GS~#)^+)J=*"!W,0!&%S'.#*8 ɪKoQ5l&kqxqս"xy5_Y=grԍL j27ez%ؒ0Iѽ%wcx"CSp`.7"d2hQY#-;:Qx1h)8_T\Ig'V.UJ҇WFvӞ I2-y/ekɶ0TL=C|+ #)1j\5n**y3(۞b\s a+f8.nxB^=fI2% c#4OzjMJ.Q/$ %F4xj=ڶW<Gld+:-#4GJ 0`tscB}&;/~& . 6fek;xI+gaC4Vh6FteRe#)bu|ɰU#)l#*+bb04f I#QTGXްBOV ur!P~/$EuA,ÊR`b&Ugxp_۫!( #4U6Bৰ,[ɝ \!?D ҍ gݣ:;U.{ËlG LP)mڑ "\M_j(;]v͖iAC5D ^Z#>k4uzQq4]k%gr b <GCB VAvT |TfMdwvߘ*|ν3D;#4v Xx<h{%qC.v.7'3T#BY:ewMEAqz{ %%#)\#)l[r`c#)W 6WRݛԕ؏yoYKGH͆=üz-M6ɦM$DPm7Ft#7$; i"fM`#Q̴A"F Ɉ(5>[n(P^C1ެC cPLj/,6[6^+j NcHzѸz}vWyIg%{?(e3Hw4яMRBޫhKW lh.Qwc>Gf H HHl1 ø exMԱYLy N̰bMNlV~^X+#*^2m^Z #3(_g` {L4qRgD;#),z6sD\)eMl)7J4#*ly ;eղHȒ %S/~Ti I`C8LlC_8eK"P o#*PbŅd=dž\j{E>'>یqBNPs0CP4Ƀ"" `"2L63؎eʇt*Axrmu M/Q!=Y T@/:aѴa+'-πl@(Jz#4m7ͽK<-U|r4X8NzUDZ%)5ME +FLN IqW [ /,h<2S]??~z/kij7D ݝ4p~ s: r O(\u3aڭNcL6dOM}N c~#4Ƞǰ|? WB}AP|a>kE!#s"tC|Z^ӵoĜEGo='Gxo1R_ k|Bӝ{1lb'/骑\Lg1転c1* %G#}C) S % )=Էzm EJ.R: u]RYTr.TNӽR2YhZLDvHF) 8@#!qdU:vThTZvBBDNjV#4ܖJ 8nlWw柏f}Kz Q`x9}8=|?Xw#.JcBwCw0n'wX/ /xӃ]@;b% \+a5V_a#4wmp (q}uti%ikܜ) ܼB#*0Lcl,%Т 4,%'qTd/m9_zK;WJ_-o@Wu;Cot"W,XL}GѸqo*+/dΧ?ʗݣûgowvߝ ܽ9{{pmtulAn 쿼;w{^)褺sZ#4hF_yRQA1y4{i 5B( v=.5 T70J )4i#` פq y *8ш"فN<>jZ.vZ2\^Me ̷P=>P@[O9u41"Êv+Ώ<.>RڒGW8 {6|}y* IYva^1#*lȏegy[ЪoArH4OnAr]a( J$LT[i]"I46Pf2" O-[\9 >Lc0%l?{Ǜ'_?*EG-ef(aeC ܥ!j[1h%!P aDEM%q PݤBʄ6'T(IF7`&iF*i{EtmJ7Qg%kE @LƅL$dK#_esd ON%Nak͋zwW@&4Uz3.݁<XUΤ OvvNO>Є>|赆)2zk仁ʏ尣vg-&iܝN\X:PD.Nt# ))9m9ڥnkF-{DJ8L gQa!/fس'G | GUYBqY $nOfiͰ U$ xJF7{x m"5ZK)2u` q+ p"?}c4/Q4AvuF 9מh4#)Y/,}& Us WR6Ft #Zń zHWtee%Z>hӬ%A. Ⱥ\L9iƃPf-lu~Q>#4<ng5cW'vXA;O*S)-NCy&*jJY\}'a#)Nm^ު9zET" z@pֈ' "aO}C'iу- T^vC6a,zp@.eNZX.s2(=k`ߛ7GoEAF}D2"PB#4HhbыDy-t~e&"[9qu۸r?B}#*cpͼn(n«ʯhNghMHDem+dǘ岿<#4MOA#4f.'ZRwzQ_ZCC+@ce;֕Typ뵚Ƴ/O~o֧]ce!= B{ 1e"[pu{lVA7x6 : gs&KBܦ{J e_ nj$GzOt+;nFQwG^(k#) M#)mc ;X(ԶꁣW=V4*S&&}7{'tY[.xF720 x{/xie+Y7ƾQW_ H H u+#$C%˃v hFv#4^7\_J 9r[Si~_NGNvy\@{AgI06YFGfMk'I,WͦhʽzB Ŝ2 ѽ:UH#4Vol${u7scUyW+H}/,CCE 7hmmjgA? hyʀ$-4!TSa-?@)>Got5`s_T#4\ 3>t"A n =cUGg؍_ʂؑ_%(Y⨢ KMgܕ#rf7[V]<ÿ <F7cZ]>ЉfV B:\TbʸiZu u[#*Y [B?#=ig϶f岽0 #*^ -1#){#)#*v=#!GLd 1p*|Oy+f>Cǥ^3 ;}*{^Nb{uz¯]S}? v r,RGpj~#)%I-=%2HyQgBc2ܺ?.d]ɛ.QPpл.}ZŹ#$&k)H;Z?7]ffj#*7lShיxç]{~e#)Yy Y=88)e$'I++IVS$a"ކf#)oɢ) 'mPyc#%88,,.]}}? GYƦULQ)N&f.`Z7I~[j> ,_0 `7/GDoʃ1")pRU z"TSl?U T_x*l[%'"yCm#)^E \b˪Y|8 Ӆj>wdVl'N1!L-<eN?V- *Q"#*3<A)KEuK.cɤ^Y;\ \btم@XH/&h cB UI+RpⷧOՓWN#4? y1ʨUjzL$(|]Nt+KDD#)7n+~}G*0;ZY #4Go#)D3{++r.,qTo~QIgxQ}r#*CKKPJDXY+qO#)MS 7 ODeSV,E1_I"#)x\a_stY e >נ-#@ _6]^ D S}*!#)$$3URwY~(>h:~NbȤS,ؕP#){p#4 C ܬ y0i,[Zw,mF2#*~a=h3;ϳ=XrkZbS eVl]UѦ#*q`og8'?#4:<~ŃuC:ZRO;盛pe 8Gn^zf )KOAU|6t j·zKU :ƷI1Q6C\-^wIUQ[\R ZI!|9VJ*c3~7{{:kS'B:EiL[Ʊ28rW|s:yzx+QOdҪ\m#* ҰӉ' yߙ=(MXvjJ~\{S5?نt:IUuQ3P}"[QS % (7RDPUBU&T@J/_=7IΰX0Yj3+>z괊;;= sFf~F80S >{uaUe bpoY#4ҲKn^CS}V}~O ӯLnݮOv1'O9v%W{ɽJcn)/hCޞtuoՔح7Ui_4[Yu=yq~{=~tOL$;v7wvd^ߝng6S#45δ[7& "2q{D֑o `.(Ʋ_M"#*]I %~#)@_|T5 73$AAZ2D#FN&= 8dr y郲^9#*$IYY{q$'s(>XjcOKSxl1pOK -ZH" r+e[L"=J¿pxiu5#*L?8*`79%[EcNƍfѼFolN3 &Y& `E\ղ4. }qi"a m墏'#*:iO3(éR@ŊD'eLcqZ/ Ԫ*{-힉aT}]X5yR_uM;i;"yxԝԝ*w.D45M:^p6DyuZRD|A`c꿹Z#)È;Mp!f\#4uZ/#4F71痁ŋxDi|^b6 Ȳ6#4drρNW@N9'>tfKxfYSqqrP<n`<`_TV/~HJ~_yk%8{w E *I흩5݄i&[Qi% y52M`~IB4hP1i^E1#c@Fׄ⧌%&rfbGʣ: CSaT?v_'p~A~GF(Pᶄl<<+Cv#)<wؖK2cwE<:KbB DTHf$Qӟvݣ@UE- DQ#*'݈m ׃7%w+tRKnzuc!wN|7#I@.Zm@= OX~ϞmAXgO&NHxf=IcН^n1 ź] A4 _*ʋʋ#4+ r{iB a}[rXg|ps7Նѫ3~x&*w3:U#*篘Fut琚B S F\1x߰k(s+W LX9!2 8_>ayd^iQ~(#4Y @rfRӒHOY.gOw<껚Z&?9QsyXUmуs#4ĕ)PZRq} 2͚Cx<lMXoIGJyCÄn kG3_D @lS ] E֥{?u4z)a ۣ!Bq<MuQY|<k;HDӢ*#*ٌ\oFi39;V_s cMd'1fU7-l1l .&Y9n+L,H93ٹT]]èuk9:RUxiL$W*-]ZT3 H7$(te(ϊhZpc-o?&IC&C8x#*mG -+ Fv rfdY.7M\$ ` Lh^DŘ*q#*;uFJ߳<â+cròObvj#*;GO^#4+.'Eo9)P\ŗgyTeyR 0eJ*(x# )5GF 8WH~]?TM2FV;[mİ9xXd^['oz:D @'h"ѳ / 'N bGy!!i`-Z4沰~0ATKv%MTU}U#}}n8xvLO D-#4VA ,K}W+T<pg8̰QswL~8H#ӝ 4cTW2 #4 5qiA0Gk<u фwP=sJZ\jb/a!* $4ݠ yi3ʨ;!ec@8N&AIIZ.]s# T <Gl9E& gf`ؗ=Qm ƭs1 9ux:*AhpGeZ][npdޔ 6'X3$bӒW\YACT֝ıLfKJ͍#*+r-i-1X9 mA$7PU#)4"_@~Upd sTQ5kJG*ݦ>mMu ڍ SMY9zso*Zz 1F:Ci.7Aq]4/Mf_BިWa*+ ?!3:OeSO91IXunDM[+춚pR6b ॠ;/oTX/1`X6k 3VKߖ: dr9]!caYK)#YUT H#*qb;Ѭa`1TOVH&ˆ6+ n%'i`сܛ^#)_(&(pݭ\1=@?;I!BԢzխ9EˣH?%~#4$K˜Kg~nq=f(LZX#*`314cELp:hU<Z#{lCYi fy(8:mi:x/_tk]{Ck֒y#*abc)(:UT](.S: oy{j2u:A#4HPW ddy A9:O3u["ph ioE e+B#22 "vn]CzIAR bH2 rd2_3=ywkg=#)$kȝm?Sʑ3B..%A#)F:^<eH<H*<|]a|HA9p#)VLL#*Kߊgj ?Y ѿ稄: #S_i.4H'է3Uc G -zC7o/!~zjqBѝa謗 Le]NLCir쎻V"| ^Ig'r0Mj4L46U6 ə}btҝ0_nF%7|jԹ+7y]mp [3`8$#4x׃[ N墳 0 ܡBױꇙ0 (;ͳ] {%m%1}ւ8sJmwY9a2ky@B5" 6}a?l;;J&O䧿x{]Y:"wwmyRa qҦzjz#*ό#?CvF5br3X 74[r#)ḨfT)ߛ3Ҫ~N-rd{ pzÎ *tOn`ТbzDיDYS?#)z1ٷO3E@ +ލPɃ%x_~4f*"7B#4ڴrDr4ЂeQW$M`AK_cOu=ۘG $EA4'lunv+^ \]B6U~ܔw>Ϟ{S{Za.D)k;ؕkװ-+q ?l=huJ86BZkua&Idtv!;?;gx"#*=D¥SjE1[$ HcXـ6JZ#ܑh8,S,XY+-_k\yjkuT%¼PW%U@$a~/]iQ"Rd{L]_ɋR-˞-`K9/Gx -¦CPh4<'d)kڞvƏ6')31K#* #)ʩsr 83Ԣ:.!ĤՅ )nF"qW#4-\Ƈ %tV)R/#*d1*-f#4P_Z4<7 ٌZR7jZ#4\ҏ1c+TX'%#4ۚvzZAG=$P5cA5oRrc@uH*9ebEJq{BcrLNni}CO:NBr9ȋne s.!uyB5[)R}mCi5$4|,>xwBʓD<}s?=rI{4Mq7A\L;ΆV FG #* ?Q5iD>O/ҠcqjYhc T;P5RhNLΊ$kri "xvqSCg"Cr8e&-tA #E3h x3'?xEwn1Hp:IQwLwn;'~:hA%#΅H| %1u1i)O`[9gXBj*]el|4ެ W: qW #**ɺ}?yPdO4vuR㖍[<peVʔDzwə,od.uW(vsd RJ#*`HE:ĵoXN[lQƛ:Gf,`<JG4[ Kt^$3@@hw<)-|7R#mfN6 KI \BV_ "aT LpfNMwtuzp;bP ;B6TG3K!] Rz<L;YS&*;n#K WA}ߤ=Ojo(w8[Y= 65*Z`@Q(i# n1E|3cecq;yUOkZn6TKUncb}XTN1,N?{*l_#*i.R!pV r <PsB1_bh.g x AR ,kKH34/4 ,QIO+Sa@ʓ#66GȄ Hi H J ?4>+ ;adڃ&&wި :P TG(5, * NJiq&J=\^d`42 B};~M<eK?%:#4Ou Q" _R1gA+"#*}ЋunJ-#*Dz#4}f̞*3.f ReXEI}1I[w)JsJ5'J?<Au甎֫ .}_+e CR$ HL| r| k"K ( 5Yğ?;E@ GGōzq|@ |#*SPY4fՖp+i#)+k!J>C{ĭ8lx 0*:\A'<51!έ.2c'h~Y>ʭ?#4^7嵺-v8E]xmludBƂYxa( a z6{tR {#S]/w>o2iEՍ#*$j=/xׯ1AQU= \|Y #*b) #)hL,J߉fMrj T| lSF&dZ#*cKOp"Yh TPn5n/~dXǢ?(%G#^{xf@%$M_A_ 3|GG5Rli~?Or"#*iDkaC^@pS]@ό-{ȁeobH#)+j6Ut=d'>9::$x/}đ[\,@Tszgkğ%!D%!)-iJ9&OzTYnsTۊux6䕌'A8dga7i7Z YrGDHF~ɚ I#:EbJd`jţ%y@u'k:GV?߹0 I{%`k p1u* я~# vJ6] ǫo M<h#* ΌVd h~smj j+z@$1Ylȡخ]INpP_"Ԥ)lI_f\udQcǂe+`"S;?V# o{'j ]P,~sn1N#ڭsKM5Tv A]POk <ZG*)<ztØk#8Ekphd-O39c(Pz4f|:Xi)PÝOֶ$#* )D Ӟ yH'ƅW\k4qT !"Q<"(E95Gl9{8@=tyѰE8:PJ|A=(*ox֗'%nv7ϓ/( 4&l?p&A&$x{=5nX'Xqn$j{R_I ҉Xʮ҈]-@T`r6JGΙp؎8<#)s+|DxBcr=!docCl bs{N{ƻ|>X, _N9Tf6)e @Gy<#*#H)a~k)%D >*$@zm5jW$'#)ưm1wΎ-0$ #*ؔf[S-l 9B -[$SBr=,u4l[@n^4^&k9 1SkMu:ǓzZnԷ !nGDcN{j[ RiYCU?We9I Qr(֜.0S.7¨64~So>d!Uk}ĺ9gf#JGTsΝʾ&[BTwuhd#4x957"nogoq&ot}YfQ bIAfԘf7!>G0zef+ !BԭLa i&אGΤ? ׇqW帻w <83'|2YNvVqtY:Ӆi4c u 'tU0Zqr ~ӊۯv.v{VsHu0s9[@z'_#4"8BˬU=d[ s:"r_ayN<rc?w_n; 5v#*ct(W.7I 7 w#*_Bh>wFÌUpcA!m pqJQ1 `:ܤHW'*٘cJ-XFh6|5$ȫ\)W)SLc6J>oaDꙮq7vx o e I=TsvF+;\G#5 sy#"Qjb h9 evz;ޒ[ {]X+wT$icUtIYY%2SaĉqTXBuFo̩dN `p)EĀ}@eu^ d++)Q#DPh7AM"1'@E;vs%kuJ@ (#)7,H#4ֲ&&(yzy])*ذR=rJ\ sVݢEi;P)a#*٫tXNP/BhĴ,ĴA'ȧx< , Fm.$xr\/koDJ]8 ՏU|#*G=Rtk9x$5~S[3ڝ\ ȬY5zN6v/#ԡ%yw3Qtol5EP'|v{67 ?K/]c{2 `˞F zlʭ5A2 c f VA5fM;{*MkQI#4*MjS_#)l:J Lr|];@Y9E²l,4A g HuFp ~z8=Eg*Ge(ًf S)[ F"ы[Yӥ*垔h;2- H.OǔR_}H'qth'=v3j Y=B; ; *NoiǏ7ap灬@" m#)AߝVsrZC#):!@|q ۔DoB||`ʁ<G #beڨy@Xa{a,?]vS:v μ?xIoG')czwXT-fiJ3N"@#4pVoѵ #!^y{azBq uzi?l ѡ 5kwM7CL6![~.h)MU֬$4gm>e wQbYxm uK Cb*3N_8FFxI8?Oի9V]wgVc~$+a?(jFT$j\db?:jb'!l0#4ѓek+mܟ;66T2Ii}#4a|9; $#LtOxw8RRW ^)@ ڽ4~"ueQjל\o5j؞G5Vך3Ǚ LѿiE Za/d"\fI8M$mN$W<`j2Tj`!MaM6U[Z#*UX#L#*ĀX7NbI#9݊%Z+O#N~fD ۷FЈF +@Bm|34uJϸV#*uC:I Q\57ۚ=(j\e CW$ʌANY=ފ6+~e(s6}a 'V_*\ޤs;%<ӻ)r ZrpoD W\ҽG@&:ё-A8n ~>I:)2v @g9q8~[{;0 Dfm5v%l[qsz'W^|bLZ ʾL/䶺r\- i?rvy\D;!Q ^CZ 塭 PuE[%0 9epAEhs7x$W6#*jaR3P|&Y %?zVcG^F`kyAE#4{s)J1ȱ"ny#*imǖbх 8cw6>a$\e,dNW}>4s[H)/;1/⼼}C2cˍb s^nZFw0]t~&Nޝ頩TH;U)RSd>XJ{D!#*!wܶE~zPxW;b#)&t(^ LrVY6ׇ<7);iO*$P%w94LJ)gԉf iB*k i]GՕPZbk>u_{ݪ!w}ޅu. Csϻ9sFO62?O7<+|RQk >~$ xwNwm8_s>%CuDsӑ-ޅTO NjgM/`}Vu#)\yG #)ڭv1cёjgnSŇnL@z;MYW3o|O>[BLŇ⡫o1D' ,#*Ux@v8\tM'ąvL\xmgL}`wjD=:fE/Cdz>$ $_qb#* 9:r A}Zɺ5-y#*On`1tn \kr4fL=)B{VA[ƛ~ 48oo+PDۨ"5] F7d@ kl^&dG?ޣú?<:I3S#)?<8<ӻ;w Z2q2»?UmZjzfFok~g\GSw)b }-";8tM?:3dH lLS%C&&GPʱ#)gmm|c@*~Y .(paayoq#*zdҰ(=8GsOn P. `a;A8^ byc#,`tUYcp9 `!M]RB:"r삠%ST^39k1'YĶBbK"i80!bIGuJo1ihH>:?O|1b0#)M_/'|z$/!<dY{?xD*#*Wbq|rdvgQ=$yTGk"ɷu-KWBm!_-]Njl!Uyyb$gnqB \GNڼV+vw1y1KRd#><PǫtNѓbY#4HCrc>,es_̽l4Wi)^Bq#*:<tЬGi!}d"H%Sfv.(EXF[JJER'6P,ULu3߯ydGղ8uG<5~9w˺ î+^/Ύ+452 c/[ʯ-e^>rnu2ve!/_ BeOB kFO)BMRB:n(CM2b$rc:y%ݒ/#4ZsZ4v90ŭi ,M?l|#rח#*\jƃ + >r q { #>/}_Ay+3A,/VxP偕1'WA?Agz #*eG3FG |<.'x!C1%*c8&֎nPC*jAw`aW)kG贈4\r0LΤFSkρ=!8Y .~s3МS̹ۡ*n$QxdI Kj_썻7C,|D<?]=b!Mbq;RќmYt&mq9#*60#)|; B;{bir7W #49,'jP6mkGFsu/͵'k1%/G`b<%>[?S{l<msdYY=gv'!#4~/oThgUF#4yqL<ʮjѥWfAe֥--p=8 @呠GqhׇG'ս6\!>5ǓZ?W+C5|?w/ = 쟞mq GT/01#*r&(A!̭3H- ou{<h[uu[?#43@z>b8(Ƞd! ƿl6W?OʐNݘd"#*|Lqr0 XtOЉdKZ+4ҺF/UUw EZ@ҵ ZLBmYj|t|_ʵ?]G|ãNꢣ`2Kf!=iԃ-w#)(NǼsB#4tlmFp#)6>cDũ%HΦ=ґIDfjܚO b;&(f qtXBR5[ت 4}nԙd:AvA k4L3opI @&<~C܊FВK7ZYvE2oojx4iZTENJO1rQllNjd"@FNn_ ,R-<,b"#*aG? ٨ j#*<iu'Z79U?Ut w1JI/x)}Ş?ȫ`h4EV]$ggJ G\!N fx/dddM 9|b]FVT !t.!`2۔Uځ?-k=\Cxms ݵCetL[Ɂ.0rmEЮp4:RBDtuR@ce,*9 ;#^5*yHcYv d/P/9r S@9NR [.|#* d !9QRHD@#)q.Hd#)Eys_*7B*KZPr<:7F%_349'*R<tr@PF MƊsz?Ry@aͣGwPi!q 5H74I rGvv~&#QIU TR] n/6%寉\8.<Gž$ib`$iŰHYE9#iؚM6MK O|i"r, Jt^8C2}5K%٩yH6S%IȖqi{EQ7trx<kQa}t<D֢&@w?HX2lPn1@h_z#*#y_/ʙ>z?q^옣T7Jw8N =D}P\V ,3@M_: fy 1vae_U}bt ']aԸD:q,Rn*8T { lY DbKɑĿNi#4v) ';>?yT4K|k#1K#*iUfj)W0^-X<TD3@0KY?: =&MiC3ڶwk#IKUh#vۉt+*zdj!D0!ӄщ#)6)g/#*N NS|VkrO%/ߤ=7|m0 `ZOWtu(sDAUm8A༆!X/z}%8h7wY%FY0i0ZP 5 -A>.YҗJM@64d h|rd_,#*u|V.;j_LURrLNk<jaHaUbU"R~Ѱ*ZuNf3Q;ڹrg 6F:ÎJ(u]& gݒ @ ZQ=B?~M&ASNC g%ϛStCNNDt,{5u]ݖx& Of"t M;^)w襨;%#4G_kkj׃Z2%NLh@dԇU&eo$( o~R0tHipb c.G)LfxyV(IU?BQ+E QF2l1 ręՕRXHu݂=~^NNU|}ptzs_VnI#)I>>9z{|F?\ I!sB*d:eZH#47;nLg.| Nz".+#)s*s6#)%"Bm' BMT$|!s(,ԎAp| [ Yl}x Y v{OX \! /L[?A<!cwI;.\ 9J >Q{F6YC#*qx:7gp\K4~9v#)$I[f[ S[ sŢ+SX #*]_x6'I=?72pF3hB]9NAdf AӅXCh-KV-su kHE(YӞM+V.AȭCiW.ۖsd^qd(y@nIĨ Ρ~ ř([KҿFߚŹ/ b"|,Tj^sMn_ EjV\& s)]zL3܉į9XI6loΰh,)AJejs%9х~:~#)P ޜDꋵ bAG5:m1ƄLvh9:.FêIjzIQt+$<4#I*L;#)q~5?<~wvo]ھ<=c*SRMLmM<gԑE=R U zؔəV! GDez(;slAjFed%f ns&>S/j#*1l6BdhT`u#n;۹DG/*oS&Zo Tnj:V 1}L4CƍoJP vb {5l:AS]HD' CHW&ANqRRq猿5T=>u#)E ?4R7lGw8M#)ʢ%}0LUG9Ki2 uf\FHۊN) k L#J#4e#31#$SMVAE5%^α1xk$M֞hőT0.Ur-u bq#*ze7ݴ+ڒ<,n@ Ө#*`a%bffJsT{WxzNqh;=AQ]6#xyGzjj+&\+HK Sf;J̈Wgɒ8Oz9Շ&z#)=(')xx qEdq OIl9 WDv|44{#*yq5=C!fws,( 72["f Vʛ =Q+UJcHe sv{F&qZa\ܤɭ{̑c,xShEeR]⺊TSocPf}vVWY/.?l\<,υ .$w }|'|̈́J#ɼ;-'k(\2Ì ZxoI'$ŴnĽ~?fw|sj6#4=.O"#NGi_ouJU`[_<|\|(qOxf.v3.^/&2Q#4MɅ-#` eFNU͉DI\!'߹e[7NnDGIL&kѵvb#=@/XxFAnyC0y3 p^ss^W[&#y&RQ8)܌TbjUA V P*&mˏTgMtn:iE2/ywUwOv s?#47TƋ27aNZ>Wq͝"3jٱGN;O'nG psH} l"7Qͺ#*Z͛z}'$Zt#*WVp }sj*r@9)fIHB+ck1#)S6zMt+2 ̕HߥZQ)+.9 yt _#4Sۉw M~a^wၺnr_ݎ4VrqC| ɘU(^E9{T0,_Z}}\j(o$&"<<a0#409]ň*i1#*m( ##4z%/x/ňM*drOՃF58HV?Ӎg_2߮s8lO.fĿqj= ц7kd{-R W1FʶȆ:c,GLa[ 8 pj"1>`)N6CAC8ĺGz7#)~g HT.螃Y =;{&?g8{+=tMugzD<ƶ~[1xWں"r7#P#9LXN!ZMퟡ7lm圀~ό k]zpq__c'#)-AwCkwaHZbI,k1u Ia=))+1u'fޕJ{\=9|+G&~B*mQ893R3Uۅ,Βhke)L#*@: zSW̕PN",. ?`BoH^y0 xe7Fi|c-ܞ' ^^YQA퀋}$R5d j740_\ "i˚Yw fc6s$19Q$BSZ8)B|MZ(k2Ku50О7iq`yV,p7b}O#lso.\ EA"P*ɰ"[ ;LG0I;P˱X) s3vd tA}R?9JgHؚĨ[f-#) 菰ֳO_FD=̷w.(cTM/jo=M']9 NzN`hڴvV,L*yRb4oy/3'dr^ԹDR_;tJɢ$?{`#he#4`#*I7e7qOAsHu9VM5>gD?M 4` ڶ;w #hӁl^JZ U"8 ۫.Hخ vN*=5#)ȿhN\dTFeQ m6+bZݱuMCNOvP"5tun?hgd*V_tbnA+!! {* WƜj+[9 f+rvov۹I{<#))$`x\Tynn" :ztyK(^*&,6^l<y/翿 ^Ldh/!;AybdE~Q#}SOm!r^1e#)wʞf{~wm<]/\E23#)fbNN#*ޚNLPy&8σټ`b$2KXs'm|D5n WGP<\7DLwGO |3#48 N$+~2 < ~DvBtkRzV oмng?w !~l UbΎ}H5#*Se%8 |MӼsZCw-pX~ih+EҙRUWQ v\_sEڷr` E5<or>`aM 㵵ʋW|e܇=?~lr")뽣TJj# :wGbT^{䗂pw6^/4`$M:L2[ w{|00{6 r?߽_8:#G l~a<4dx ӑ=A;<:F8.u4оj϶a ;;W`i] WvIu!jyk5U۔'][-a0Zc7lL TjBqVNJ+NԛnasBUoZb7u`d^K_;h9^%uyt Az|9c ~X=_?]|W+CJt[wQt7w?Dw[w_?"$oG_.!+u?$L&cM+N&"6y9^Ny0GpDtד+3)bhⱸ݊`EH(x;=~+Iޙ|T"7G@fMTI pYּe^>mo<?x"o; 7:3O#4im`Q 5֡6G3iLkl#[Ri#*śwH("\hDAΠ7 !<E0 IBpeROQcBD@BWв#4-ۡ+*t]Skv/*;`i#. lNQݙ3 #)d(RQ ab?r[9s,;ߜOmv*KgsU Kb#4,ZfMgwKTT*<v4PPCUIbTPO)Pw)E*Ud: h}DÐh(<ڜQgs| 9[1?Ev؞ͪѪdԕ$=ch9jfbs0A :*cV ڻUתC7zI[hjj阼̗$('*ͦk~y1#* J< =8O2ټy!Jm8b'J=VMR ",!M(`YQ(\EXP4k3ŗӗA&K3j,03iN鵽g퇬[iKG$Վ2y pɉfn]<s^8( Z # .<\x,y}Cf};笪Mxn?ti!ټ Ǻh*Z,[hafM"4#)#0LJK#*( 7#*[ .U " t%Fob%F8$҆#) !GFM6x#*xPދ8NY 0?$-}rWXwo-<BZCqx ej(ƀ礴t7jU(|ʯ@[Dѹ6Х4c[gh" ٤MMk #*I"@9:'f.nes떉j?/ڄs ۉ7bs$x85Kt T=O#3NP6 8XKtoNLfC o0嚯wm,ӧgX$3wb=oWu- {OFLC `E?R2(}1Ta3#w36j(yd:tIu+ϛ!u'3? X=U }!4}ihX{e`-+;cÏRqS% $ A4$,ЦM̀|pjE#993YN02|"t@ֈ[`0;}}3 m+b_`Fja#4ZTx>#DЧ9_4?6)VPKjW6#*;3ڤ%Ս;_6H`TY:pk[MV#)mcp`6YGÚ#*Nr阘e#8FZ{>4.qI'0xVܨ3 ~lr<qAGeO8i'9y}f)-4bꖚi9ZVi3؋Hv{ԹI9)j2 T 9p#)/%NNDAV!̜/O'fy\= n o6V#iG>sSgNʁ,79ܩlv~eu ̈ `卐 X3@M궹Z=xI<9[MT̴1i,I #$ȲׂYEEQ,~ N<.IG1͕IDb&1W~%"D#4,w¬96H<윀&DhK&#aAvi^bAb#%\RYぃ˓PzrYg; aRbw J[GzjFx&T*Z .O(zYCk#:Ι#*6z#4buhx\ EtY.Y b1Rj<nZ {:k% 1cQ襔^lUVmRb JHJ\Z#M X̘g}a)C8gcmڊRgSQuLNڬ`A]ٓD;ue-,6D/\ aP[}}#SC`%"ό#*{K0`TOAe,۾uʅNe, FI#*o0(#; 죈x,ľqKƴѠmJ/-kC(z.{,?wN=ku/֫aͭz̚anB#4VaȔin=7#*%R [ݺ[^)TwWϬEUk֍qc__1Wّjg#)N4u[@k di ֫G,,ߗE p${[#*`k<$_y8e}Z &Ew;ʁf 2 6 ixEpQ_@r7΅TLl&C4"6Xu:iRBΖ p \,u"( #.zmFn.Uеe1S]Jv JFjF(˳˄V<, 5ɭnJ3@7buI(r<=ְ Pe1JFNS5'R(1ꆷ/vBq#*$F#)B(S.įeAb7yG̏&Q=fVQB!u(5t"ݰԚ́PV(bxx\)֦wj .Me :ߴ*@ 6-Z_r6 2>͜6&=V#4@E0a=6u|o 'v a.>Y@K#4#)Q#4Jзof^; #)(I) \/3 Pj& f2KDz&]0#*+.ﺬea0,jbsgj6G7.V*ICmnM1 ?g@k 3z:Kva'o 2aFiXĹZ-8`#)g떭x<'sGE1wbKjd=$j6m;u],邮Cב,Ep-68` J%&(v4m/ l+ݞT \$#)2ES{3 \sRu=l60h^W ñZ7I30^a?n _劔!հsW%6Ή`g&i =e ش7'V ܐa'{-HvQ`{7^ʼn*+c6pB\eb[#)%k3)x`s2$qՖQX]W;|Q m#0'UgݖhhPz]]hP)ª~#ZgD aX#4(T,)-=1«Qݯ1v۠*1A" j^.B<dMf<1nSc^dB7Rͥ#*#L<#*-k$ܮ6a"LêS2gn`cv H/:PWX*VˬR DS2 F`ۢMxٔiIw&rX?K#4x{3Ȋ&H #4 ~_ֹ)5Ԇ4ԏ]*,[کSx7<=Ef\k/G1{8]AdZdcTS9Dlxn3ʪ7v)Ŕp::~D}Ba#)ܟK*Hn~ Oca Ekw0h"4)-;~ ?yi$URf .'o )>0a. BERobip4gu M㛴ԸWC^խ'2RB#b'F%EH< qJDVb p{LOS>8*G ֩'o iPi%DvPxH>8#)՜é$Z6IxeV-7+D䈴[:t(ƩfGZ#4 G,8 z#4] O= Vs$^1Tm;B ^ۑf:NQ?b;sb55k*ה⚧Q|G.n%qLjQo|*b@ݍ|{wMeD`E;9p BS{i jcYqnU*$9<_?#)v/<⫊ ?U9/<1\4 Jv`<(M ,l¸7#*Zs֘> |JaVbqcx'gҞezt}GNՔ jJg*+Z[:=)㳧R4 Dru]s6prhp i<pUar:A#4i 3Bd:QY y=tYg/_<~s7g?9%Z|1>#*k)-OKx6POV/c'0ýռiգYM3^ J|GZc2<IȰE'w =7[Ԥ G4<T w cO` ETϩ _.oapA( Lp= rR%T4Dڹ ,-A1ʐ@N ߎ1D'tlkKʼ4Y]S%B*kȒN#)%~PO &ƧiJԟf= 'bєJLx\ۇ MQO| M(~@&/?Nw6m> fqUCZxi5l~#;H7#j]:zR]Umڦ@@i=琺'uxbK c1|&7J8[R_ *-⇳o_gyrrPkԏ`[[f!jVdܰEbKnY<IgW3eV1Hl+XNJnP#)(ZQ7w:O&y߄?w:9z@挽{65gfh?>%!!*A:upp*_e(<Q`xi 96в̋ NG.x1̚n]ujkDJ8#*c2 /YMmfyypO 2{p,k;bū'p8zDC=Z#~MvA&x6 9jH˫MIϞ͋bD} dͮ0}+./7o<jPP #B/1}XRRHi3Zݹ`t[A ZO^x#*ROx| NAiQSK;:8+tX# uZ0\sldj1*N =q8T}qöq#ʵ]Ku^mGqxj 8 a^5N'zߏ>a3bDRaG(#*_3KCG`aXk}4 #*n~#)GŅ&9e\9HQ7{|["L%WP$opm /Q!`iXQ,"荄KnW 2R\ 2#*UJyQO^25T,jjvx$_x#5wq&C?35mq벪?>z{. I&xa20Pjȸ Jyzy|W#*y } cO'+[@I`N~[!U& aA#)N/o[{@'8G6-qIoftX^NI"y}$]=xԃ$ ~/e#4(U7&fpLOϩ{<k 0-E#*িΣ<ǹ%ꯖ!$tMhh7gjY̋jrZ R&үlP0FwPV9S$F[#4J6"42F)l>[,@n`TM<ΰlIԹm^x Q>tXl:&4,g sN7|nee$ oΈH#*HKclccj[i^e`DA7+o5ڎ5ҕ!8aGV2U!U+R\#4H> f|9P-x^3{h gڕ/r$4 m!K> EY#*P#*ʀ}O{0ef>qF_W#8MYgt-buew=kO. st0Y[tX&K#<f"snu)*9K>}8 +N [!id=4l#42c4TP3X rbIĹ#c`1J{eY;P]GioR |NnNaГByq3YL(v:5 M5!GUR<Ă V 9s-/hl]˩;A𥉉k` r,.o]݃?~v=rr.bnZ&WaY>"$HhOTbi 4#)m X 2h"B6AK=Fv.+;J:^7tAhH!EQm&sF MBd=6[E!+f-ww'^ d_ JjL6M*>qkVb+RCeF2sx''G9λҲ$Ⲳugpq V 3vx?ߍww㯿(<9>9=Qm}Vz#)N>2jw,z H/6PGGY--? c&2co-^ hsPx #4xj&hmYEڼc K̾}#*}#)|bwiO3~W 9&%\1Cϲ4<7=de#4a5ŀ pI#4 U!߸'DB$! yo~8{#A !ܐ#4_1i1Ȧ_WpH}#4#Ez5v!+|7[Y\q9t@~{~1~DAx fx=|X=4?>/>3a㓯OW%80 ?L˓/ '_U/0#4Mv%uZ]A1!)~$/j:͋?YYD>aJNf8_be7\}*u^vQ7?#)w dbǏ@B,ul̻d3G)MT1f|̛ t7[A b wՐ.8! o36Á%,(,< |a^y0#*HGPoaAs]q>(IE&ey(4pJE:=&B핣#)h=^0h74d3 CT'#)%}B#)w u2\"Q%3#){nӵ"xc7 .`94PD~DS.$ȋ> g|ݬ n&h#)jmt=&I^imTLQ2]F%XM& E -seׂZ:QR"I!RNUy ~H^rf_X!30?ֈE:HP"jNµ&jbŇ#*Yf 7lWWRetͮ ~1m=qm-<j~"xG%[hL6B,Ud7|Ŭ_#)θDx = )\^,FZ#*s#4L=ڗt#)EiXEXʽ7;^e`,M%hύQ 7qm?!Tꊗtgִ>#)[<ڕ!g#)%LAua;,VEҒx\CnWCj@5PszU PԔ@1: H~>dQ}W4U*E?d`.!#*|C<oOq()ՀrGI=}m%Jee)5 1[ڵx nCISVx4_ÌB B'ʜ99 P֚<|9-mx6ٯgAC#*"dy:`?NWL>7UnMyI #41|HPFX~ɋZ lbAg#4IS(}*@~MZ(#4ʃRݚrr%oۂŠ _uż),XxXW]4Ma^{æɮ ̰ ]!#4B@7黅Vr@b&?MѺ_D4v#*P*!̈pY!<L0ဠX<uOP<eĤX-dX-xm&7mt hܓs7#*ȶagWw"XS@AKB(IX"V%z`ߓhIp~~g#*DVf 4I+˰/aj Č,j #*#4ɐ9@ X>\nC^Rp Klو#)T=iMԮ1 :67YR6CSMW$#;{o#"Z* E&*:~M@cR] 2v .M%`gZSP)½7%!J~m*]s9r ?^CY8 'IH;ˡI"#* @&g6i,؛d1_lDkD?,#)` \#4$%9ؔ Kq/"qe ~-D 'Ӈ^4 zjoTuMPlBY~A#tx$mT5\XDSkS]0)|O^ZRg# fi#"|22b 2^|Ug[ *4](BcqǣTASTxcUjz$~cҋYm)aɯ B$=I|)Ou<X6#)Z, U늏֗~ tX Q ~ 'j`ft纟7W՚#*RM<,WF >q #)ݸ0~ $CRH>f)h>pG< X`ZX#*dvgY6bmwdǺ6fT* xW&U5 ·|ll 6]"zJy$'S % TyLa %/x` icJeP'`F6h 8# Ö˸;/#4Ύ$h#** uW. SaNy[,{Ҁ=))љڷ>ZV\ 3 4Ji#4~ڸ9$*dgGm;M~]͖9jANJ$v2`kONgZIzICZZ±2k#)ܯS2NNЭ KIә*#stnUaHY崏BXO7p{]z1f)]1#)#*c4"9'[$g1|5s#.~Tƽc(k2w _l@^Hœ,0S+)k!` p(/c]~~ϐM{ ,-l@ĚL0K0<}㳐 A sx9< sx9< sx9< sx9< O~._k#)#) -#<== diff --git a/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.5.3.bb b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.6.1.bb index a90ff5225..b0f565b9b 100644 --- a/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.5.3.bb +++ b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.6.1.bb @@ -5,25 +5,25 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz" SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=e11f5c3149cdec4bb309babb020b32b9 \ - file://src/hb-ucd.cc;md5=343f1797944de49ab2b5f5cf3126d3f2" + file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc" DEPENDS = "glib-2.0 cairo fontconfig freetype" SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.xz" -SRC_URI[md5sum] = "29a310e74a90b4e4f6d62f3e74a571e5" -SRC_URI[sha256sum] = "fed00dc797b7ba3ca943225f0a854baaed4c1640fff8a31d455cd3b5caec855c" +SRC_URI[md5sum] = "89b758a2eb14d56a94406cf914b62388" +SRC_URI[sha256sum] = "c651fb3faaa338aeb280726837c2384064cdc17ef40539228d88a1260960844f" inherit autotools pkgconfig lib_package gtk-doc PACKAGECONFIG ??= "icu" PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu" +PACKAGECONFIG[graphite] = "--with-graphite2,--without-graphite2,graphite2" EXTRA_OECONF = " \ --with-cairo \ --with-fontconfig \ --with-freetype \ --with-glib \ - --without-graphite2 \ " PACKAGES =+ "${PN}-icu ${PN}-icu-dev" diff --git a/poky/meta/recipes-graphics/images/core-image-clutter.bb b/poky/meta/recipes-graphics/images/core-image-clutter.bb index b0f25cf1b..a59446102 100644 --- a/poky/meta/recipes-graphics/images/core-image-clutter.bb +++ b/poky/meta/recipes-graphics/images/core-image-clutter.bb @@ -11,3 +11,5 @@ IMAGE_INSTALL = "\ " inherit core-image + +QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' diff --git a/poky/meta/recipes-graphics/images/core-image-x11.bb b/poky/meta/recipes-graphics/images/core-image-x11.bb index 8455bb8ca..cd5374949 100644 --- a/poky/meta/recipes-graphics/images/core-image-x11.bb +++ b/poky/meta/recipes-graphics/images/core-image-x11.bb @@ -7,3 +7,5 @@ LICENSE = "MIT" inherit core-image distro_features_check REQUIRED_DISTRO_FEATURES = "x11" + +QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' diff --git a/poky/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.2.bb b/poky/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.3.bb index e1df754b7..1cf854de6 100644 --- a/poky/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.2.bb +++ b/poky/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.3.bb @@ -14,8 +14,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://0001-libjpeg-turbo-fix-package_qa-error.patch \ " -SRC_URI[md5sum] = "79f76fbfb0c6109631332762d10e16d2" -SRC_URI[sha256sum] = "acb8599fe5399af114287ee5907aea4456f8f2c1cc96d26c28aebfdf5ee82fed" +SRC_URI[md5sum] = "bd07fddf26f9def7bab02739eb655116" +SRC_URI[sha256sum] = "4246de500544d4ee408ee57048aa4aadc6f165fc17f141da87669f20ed3241b7" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" diff --git a/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb b/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb index dd706a960..c8d1650c6 100644 --- a/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb +++ b/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb @@ -23,8 +23,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} egl" EXTRA_OEMESON += "-Dtests=false" -PACKAGECONFIG_class-native = "egl" -PACKAGECONFIG_class-nativesdk = "egl" +PACKAGECONFIG_class-native = "egl x11" +PACKAGECONFIG_class-nativesdk = "egl x11" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/mesa/mesa.inc b/poky/meta/recipes-graphics/mesa/mesa.inc index fcd19884f..f916e553c 100644 --- a/poky/meta/recipes-graphics/mesa/mesa.inc +++ b/poky/meta/recipes-graphics/mesa/mesa.inc @@ -98,6 +98,9 @@ PACKAGECONFIG[vc4] = "" PACKAGECONFIG[v3d] = "" GALLIUMDRIVERS = "swrast" +# gallium swrast was found to crash Xorg on startup in x32 qemu +GALLIUMDRIVERS_x86-x32 = "" + GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}" GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'kmsro', ',kmsro', '', d)}" GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'vc4', ',vc4', '', d)}" @@ -122,6 +125,9 @@ PACKAGECONFIG[xa] = "-Dgallium-xa=true, -Dgallium-xa=false" PACKAGECONFIG[lima] = "" GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}" +PACKAGECONFIG[panfrost] = "" +GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panfrost', '', d)}" + OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium', 'classic', d)}" PACKAGECONFIG[osmesa] = "-Dosmesa=${OSMESA},-Dosmesa=none" diff --git a/poky/meta/recipes-graphics/pango/pango_1.44.5.bb b/poky/meta/recipes-graphics/pango/pango_1.44.6.bb index a143723c7..882eada7a 100644 --- a/poky/meta/recipes-graphics/pango/pango_1.44.5.bb +++ b/poky/meta/recipes-graphics/pango/pango_1.44.6.bb @@ -16,8 +16,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection SRC_URI += "file://run-ptest" -SRC_URI[archive.md5sum] = "b6bf689e3ce4f46b0fd887b64c850ea1" -SRC_URI[archive.sha256sum] = "8527dfcbeedb4390149b6f94620c0fa64e26046ab85042c2a7556438847d7fc1" +SRC_URI[archive.md5sum] = "db0a3243ba33e02aaa775412f8e5f412" +SRC_URI[archive.sha256sum] = "3e1e41ba838737e200611ff001e3b304c2ca4cdbba63d200a20db0b0ddc0f86c" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" @@ -26,6 +26,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ PACKAGECONFIG[x11] = ",,virtual/libx11 libxft" PACKAGECONFIG[tests] = "-Dinstall-tests=true, -Dinstall-tests=false" +PACKAGECONFIG[thai] = ",,libthai" GTKDOC_MESON_OPTION = "gtk_doc" GIR_MESON_OPTION = 'introspection' diff --git a/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch b/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch deleted file mode 100644 index aa8d81484..000000000 --- a/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d61f7073b8ce159d21811b291c22b273b040c330 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 12 Feb 2019 12:04:52 +0100 -Subject: [PATCH] Makefile.am: explicitly link with libdrm - -Otherwise, a failure happens with gold linker: - -../src/.libs/libvirglrenderer.so: error: undefined reference to 'drmPrimeHandleToFD' - -https://errors.yoctoproject.org/Errors/Details/222046/ - -Upstream-Status: Accepted [https://gitlab.freedesktop.org/virgl/virglrenderer/merge_requests/153] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - src/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 9a0a44e..9b668c8 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,5 +1,6 @@ - SUBDIRS := gallium/auxiliary - AM_LDFLAGS = -lm \ -+ $(LIBDRM_LIBS) \ - $(GBM_LIBS) \ - $(EPOXY_LIBS) \ - $(X11_LIBS) \ --- -2.17.1 - diff --git a/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch b/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch deleted file mode 100644 index 2b4ffa932..000000000 --- a/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 05c5c5f43fbffb3317bd9da27d414890d2ef493c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 18 Jan 2019 13:47:23 +0100 -Subject: [PATCH] vtest: add missing includes - -This fixes build failures with musl C library - -Upstream-Status: Accepted [https://gitlab.freedesktop.org/virgl/virglrenderer/merge_requests/125] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - vtest/util.c | 1 + - vtest/vtest_server.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/vtest/util.c b/vtest/util.c -index 0d3c78f..c605253 100644 ---- a/vtest/util.c -+++ b/vtest/util.c -@@ -26,6 +26,7 @@ - #include <stdio.h> - #include <string.h> - #include <unistd.h> -+#include <sys/select.h> - - int vtest_wait_for_fd_read(int fd) - { -diff --git a/vtest/vtest_server.c b/vtest/vtest_server.c -index bc6c95f..010721f 100644 ---- a/vtest/vtest_server.c -+++ b/vtest/vtest_server.c -@@ -31,6 +31,7 @@ - #include <netinet/in.h> - #include <sys/un.h> - #include <fcntl.h> -+#include <string.h> - - #include "util.h" - #include "vtest.h" diff --git a/poky/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb b/poky/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb index 818d5b630..d2b11c103 100644 --- a/poky/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb +++ b/poky/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb @@ -5,10 +5,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" DEPENDS = "libdrm mesa libepoxy" -SRCREV = "402c228861c9893f64cffbbcb4cb23044b8c721c" +SRCREV = "48cc96c9aebb9d0164830a157efc8916f08f00c0" SRC_URI = "git://anongit.freedesktop.org/virglrenderer \ - file://0001-vtest-add-missing-includes.patch \ - file://0001-Makefile.am-explicitly-link-with-libdrm.patch \ file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \ " diff --git a/poky/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/poky/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch deleted file mode 100644 index acea9dbc3..000000000 --- a/poky/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch +++ /dev/null @@ -1,80 +0,0 @@ -From c4677e155736062e75687f1a655732c8902e912b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 May 2015 20:56:00 -0700 -Subject: [PATCH] make error() portable - -error() is not posix but gnu extension so may not be available on all -kind of systemsi e.g. musl. - -Upstream-Status: Submitted - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Ming Liu <ming.liu@toradex.com> ---- - libweston/weston-error.h | 20 ++++++++++++++++++++ - libweston/weston-launch.c | 2 +- - meson.build | 1 + - 3 files changed, 22 insertions(+), 1 deletion(-) - create mode 100644 libweston/weston-error.h - -diff --git a/libweston/weston-error.h b/libweston/weston-error.h -new file mode 100644 -index 0000000..2089d02 ---- /dev/null -+++ b/libweston/weston-error.h -@@ -0,0 +1,20 @@ -+#ifndef _WESTON_ERROR_H -+#define _WESTON_ERROR_H -+ -+#if defined(HAVE_ERROR_H) -+#include <error.h> -+#else -+#include <err.h> -+#include <string.h> -+#define _weston_error(S, E, F, ...) do { \ -+ if (E) \ -+ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \ -+ else \ -+ err(S, F, ##__VA_ARGS__); \ -+} while(0) -+ -+#define error _weston_error -+#endif -+ -+#endif -+ -diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c -index bf73e0d..9064439 100644 ---- a/libweston/weston-launch.c -+++ b/libweston/weston-launch.c -@@ -33,7 +33,6 @@ - #include <poll.h> - #include <errno.h> - --#include <error.h> - #include <getopt.h> - - #include <sys/types.h> -@@ -59,6 +58,7 @@ - #endif - - #include "weston-launch.h" -+#include "weston-error.h" - - #define DRM_MAJOR 226 - -diff --git a/meson.build b/meson.build -index 2155b7b..baa52d9 100644 ---- a/meson.build -+++ b/meson.build -@@ -94,6 +94,7 @@ foreach func : optional_libc_funcs - endforeach - - optional_system_headers = [ -+ 'error.h', - 'linux/sync_file.h' - ] - foreach hdr : optional_system_headers --- -2.7.4 - diff --git a/poky/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/poky/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch index 81cc02537..e50845b17 100644 --- a/poky/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch +++ b/poky/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch @@ -1,4 +1,4 @@ -From 7d2fea61a95e9498b5a19c8cffcb2ab5631d5685 Mon Sep 17 00:00:00 2001 +From 682b7d79a7b81ec8e38760381104b24ad549e8c0 Mon Sep 17 00:00:00 2001 From: Tom Hochstein <tom.hochstein@nxp.com> Date: Wed, 22 Feb 2017 15:53:30 +0200 Subject: [PATCH] weston-launch: Provide a default version that doesn't require @@ -18,16 +18,16 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Ming Liu <ming.liu@toradex.com> --- libweston/meson.build | 16 ++++++++++++---- - libweston/weston-launch.c | 20 ++++++++++++++++++++ + libweston/weston-launch.c | 21 +++++++++++++++++++++ meson_options.txt | 7 +++++++ - 3 files changed, 39 insertions(+), 4 deletions(-) + 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/libweston/meson.build b/libweston/meson.build -index 33ab970..32f495a 100644 +index d8d3fc0..326683f 100644 --- a/libweston/meson.build +++ b/libweston/meson.build -@@ -472,16 +472,24 @@ if get_option('renderer-gl') - endif +@@ -199,16 +199,24 @@ dep_vertex_clipping = declare_dependency( + ) if get_option('weston-launch') - dep_pam = cc.find_library('pam') @@ -56,7 +56,7 @@ index 33ab970..32f495a 100644 install: true ) diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c -index 9064439..c6abe92 100644 +index 4962bd6..fc531c5 100644 --- a/libweston/weston-launch.c +++ b/libweston/weston-launch.c @@ -51,7 +51,9 @@ @@ -69,7 +69,7 @@ index 9064439..c6abe92 100644 #ifdef HAVE_SYSTEMD_LOGIN #include <systemd/sd-login.h> -@@ -101,8 +103,10 @@ drmSetMaster(int drm_fd) +@@ -100,8 +102,10 @@ drmSetMaster(int drm_fd) #endif struct weston_launch { @@ -80,7 +80,7 @@ index 9064439..c6abe92 100644 int tty; int ttynr; int sock[2]; -@@ -191,6 +195,7 @@ weston_launch_allowed(struct weston_launch *wl) +@@ -192,6 +196,7 @@ weston_launch_allowed(struct weston_launch *wl) return false; } @@ -88,7 +88,7 @@ index 9064439..c6abe92 100644 static int pam_conversation_fn(int msg_count, const struct pam_message **messages, -@@ -231,6 +236,7 @@ setup_pam(struct weston_launch *wl) +@@ -232,6 +237,7 @@ setup_pam(struct weston_launch *wl) return 0; } @@ -96,7 +96,7 @@ index 9064439..c6abe92 100644 static int setup_launcher_socket(struct weston_launch *wl) -@@ -424,6 +430,7 @@ quit(struct weston_launch *wl, int status) +@@ -431,6 +437,7 @@ quit(struct weston_launch *wl, int status) close(wl->signalfd); close(wl->sock[0]); @@ -104,7 +104,7 @@ index 9064439..c6abe92 100644 if (wl->new_user) { err = pam_close_session(wl->ph, 0); if (err) -@@ -431,6 +438,7 @@ quit(struct weston_launch *wl, int status) +@@ -438,6 +445,7 @@ quit(struct weston_launch *wl, int status) err, pam_strerror(wl->ph, err)); pam_end(wl->ph, err); } @@ -112,7 +112,7 @@ index 9064439..c6abe92 100644 if (ioctl(wl->tty, KDSKBMUTE, 0) && ioctl(wl->tty, KDSKBMODE, wl->kb_mode)) -@@ -610,6 +618,7 @@ setup_session(struct weston_launch *wl, char **child_argv) +@@ -660,6 +668,7 @@ setup_session(struct weston_launch *wl, char **child_argv) setenv("HOME", wl->pw->pw_dir, 1); setenv("SHELL", wl->pw->pw_shell, 1); @@ -120,7 +120,7 @@ index 9064439..c6abe92 100644 env = pam_getenvlist(wl->ph); if (env) { for (i = 0; env[i]; ++i) { -@@ -618,6 +627,7 @@ setup_session(struct weston_launch *wl, char **child_argv) +@@ -668,6 +677,7 @@ setup_session(struct weston_launch *wl, char **child_argv) } free(env); } @@ -128,7 +128,7 @@ index 9064439..c6abe92 100644 /* * We open a new session, so it makes sense -@@ -685,8 +695,10 @@ static void +@@ -739,8 +749,10 @@ static void help(const char *name) { fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name); @@ -139,7 +139,7 @@ index 9064439..c6abe92 100644 fprintf(stderr, " -t, --tty Start session on alternative tty,\n" " e.g. -t /dev/tty4, requires -u option.\n"); fprintf(stderr, " -v, --verbose Be verbose\n"); -@@ -700,7 +712,9 @@ main(int argc, char *argv[]) +@@ -754,7 +766,9 @@ main(int argc, char *argv[]) int i, c; char *tty = NULL; struct option opts[] = { @@ -149,21 +149,24 @@ index 9064439..c6abe92 100644 { "tty", required_argument, NULL, 't' }, { "verbose", no_argument, NULL, 'v' }, { "help", no_argument, NULL, 'h' }, -@@ -712,9 +726,13 @@ main(int argc, char *argv[]) +@@ -766,11 +780,16 @@ main(int argc, char *argv[]) while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) { switch (c) { case 'u': +#ifdef HAVE_PAM wl.new_user = optarg; - if (getuid() != 0) - error(1, 0, "Permission denied. -u allowed for root only"); + if (getuid() != 0) { + fprintf(stderr, "weston: Permission denied. -u allowed for root only\n"); + exit(EXIT_FAILURE); + } +#else -+ error(1, 0, "-u is unsupported in this weston-launch build"); ++ fprintf(stderr, "weston: -u is unsupported in this weston-launch build\n"); ++ exit(EXIT_FAILURE); +#endif break; case 't': tty = optarg; -@@ -755,8 +773,10 @@ main(int argc, char *argv[]) +@@ -822,8 +841,10 @@ main(int argc, char *argv[]) if (setup_tty(&wl, tty) < 0) exit(EXIT_FAILURE); @@ -175,7 +178,7 @@ index 9064439..c6abe92 100644 if (setup_launcher_socket(&wl) < 0) exit(EXIT_FAILURE); diff --git a/meson_options.txt b/meson_options.txt -index 0e1d183..9a5c3d5 100644 +index d5bf1d5..254eb2b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -73,6 +73,13 @@ option( diff --git a/poky/meta/recipes-graphics/wayland/weston_6.0.1.bb b/poky/meta/recipes-graphics/wayland/weston_7.0.0.bb index fe8f1b8c3..5d2a9336f 100644 --- a/poky/meta/recipes-graphics/wayland/weston_6.0.1.bb +++ b/poky/meta/recipes-graphics/wayland/weston_7.0.0.bb @@ -9,11 +9,10 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://weston.png \ file://weston.desktop \ file://xwayland.weston-start \ - file://0001-make-error-portable.patch \ file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ " -SRC_URI[md5sum] = "e7b10710ef1eac82258f97bfd41fe534" -SRC_URI[sha256sum] = "bf2f6d5aae2e11cabb6bd69a76bcf9edb084f8c3e14ca769bea7234a513155b4" +SRC_URI[md5sum] = "cbfda483bc2501d0831af3f33c707850" +SRC_URI[sha256sum] = "a00a6d207b6a45f95f4401c604772a307c3767e5e2beecf3d879110c43909a64" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" @@ -26,7 +25,7 @@ DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" -EXTRA_OEMESON += "-Dbackend-default=auto -Dbackend-rdp=false" +EXTRA_OEMESON += "-Dbackend-default=auto -Dbackend-rdp=false -Dpipewire=false" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ diff --git a/poky/meta/recipes-kernel/dtc/dtc_1.5.0.bb b/poky/meta/recipes-kernel/dtc/dtc_1.5.0.bb deleted file mode 100644 index a9c131706..000000000 --- a/poky/meta/recipes-kernel/dtc/dtc_1.5.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require dtc.inc - -LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c" - -SRCREV = "d37f6b20107e952064e3f77e9d6915a9c09d10a6" - -S = "${WORKDIR}/git" - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-kernel/dtc/dtc_1.5.1.bb b/poky/meta/recipes-kernel/dtc/dtc_1.5.1.bb new file mode 100644 index 000000000..9df8a06d4 --- /dev/null +++ b/poky/meta/recipes-kernel/dtc/dtc_1.5.1.bb @@ -0,0 +1,10 @@ +require dtc.inc + +LIC_FILES_CHKSUM = "file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://libfdt/libfdt.h;beginline=4;endline=7;md5=05bb357cfb75cae7d2b01d2ee8d76407" + +SRCREV = "60e0db3d65a1218b0d5a29474e769f28a18e3ca6" + +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch deleted file mode 100644 index 5ea46e959..000000000 --- a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 35341ca0614ab13e1ef34ad4f29a39e15ef31fa8 Mon Sep 17 00:00:00 2001 -From: Anisse Astier <aastier@freebox.fr> -Date: Mon, 17 Jun 2019 15:22:22 +0200 -Subject: [PATCH] arm64/sve: <uapi/asm/ptrace.h> should not depend on - <uapi/linux/prctl.h> - -Pulling linux/prctl.h into asm/ptrace.h in the arm64 UAPI headers causes -userspace build issues for any program (e.g. strace and qemu) that -includes both <sys/prctl.h> and <linux/ptrace.h> when using musl libc: - - | error: redefinition of 'struct prctl_mm_map' - | struct prctl_mm_map { - -See https://github.com/foundriesio/meta-lmp/commit/6d4a106e191b5d79c41b9ac78fd321316d3013c0 -for a public example of people working around this issue. - -Although it's a bit grotty, fix this breakage by duplicating the prctl -constant definitions. Since these are part of the kernel ABI, they -cannot be changed in future and so it's not the end of the world to have -them open-coded. - -Fixes: 43d4da2c45b2 ("arm64/sve: ptrace and ELF coredump support") - -Upstream-Status: Backport [https://github.com/torvalds/linux/commit/35341ca0614ab13e1ef34ad4f29a39e15ef31fa8] -Cc: stable@vger.kernel.org -Acked-by: Dave Martin <Dave.Martin@arm.com> -Signed-off-by: Anisse Astier <aastier@freebox.fr> -Signed-off-by: Will Deacon <will.deacon@arm.com> ---- - arch/arm64/include/uapi/asm/ptrace.h | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h -index 97c53203150b..e932284993d4 100644 ---- a/arch/arm64/include/uapi/asm/ptrace.h -+++ b/arch/arm64/include/uapi/asm/ptrace.h -@@ -65,8 +65,6 @@ - - #ifndef __ASSEMBLY__ - --#include <linux/prctl.h> -- - /* - * User structures for general purpose, floating point and debug registers. - */ -@@ -113,10 +111,10 @@ struct user_sve_header { - - /* - * Common SVE_PT_* flags: -- * These must be kept in sync with prctl interface in <linux/ptrace.h> -+ * These must be kept in sync with prctl interface in <linux/prctl.h> - */ --#define SVE_PT_VL_INHERIT (PR_SVE_VL_INHERIT >> 16) --#define SVE_PT_VL_ONEXEC (PR_SVE_SET_VL_ONEXEC >> 16) -+#define SVE_PT_VL_INHERIT ((1 << 17) /* PR_SVE_VL_INHERIT */ >> 16) -+#define SVE_PT_VL_ONEXEC ((1 << 18) /* PR_SVE_SET_VL_ONEXEC */ >> 16) - - - /* --- -2.22.0 - diff --git a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.0.bb b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb index 473688d95..9d18df76c 100644 --- a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.0.bb +++ b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb @@ -12,8 +12,7 @@ SRC_URI_append_libc-musl = "\ SRC_URI_append = "\ file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \ file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \ - file://0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch \ " -SRC_URI[md5sum] = "7381ce8aac80a01448e065ce795c19c0" -SRC_URI[sha256sum] = "437b141a6499159f5a7282d5eb4b2be055f8e862ccce44d7464e8759c31a2e43" +SRC_URI[md5sum] = "ddf994de00d7b18395886dd9b30b9262" +SRC_URI[sha256sum] = "54ad66f672e1a831b574f5e704e8a05f1e6180a8245d4bdd811208a6cb0ac1e7" diff --git a/poky/meta/recipes-kernel/linux/kernel-devsrc.bb b/poky/meta/recipes-kernel/linux/kernel-devsrc.bb index 3900489ac..b68d945a8 100644 --- a/poky/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/poky/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -141,7 +141,7 @@ do_install() { # arch/arm64/include/asm/opcodes.h references arch/arm cp -a --parents arch/arm/include/asm/opcodes.h $kerneldir/build/ - cp -a --parents arch/arm64/kernel/vdso/gettimeofday.S $kerneldir/build/ + cp -a --parents arch/arm64/kernel/vdso/*gettimeofday.* $kerneldir/build/ cp -a --parents arch/arm64/kernel/vdso/sigreturn.S $kerneldir/build/ cp -a --parents arch/arm64/kernel/vdso/note.S $kerneldir/build/ cp -a --parents arch/arm64/kernel/vdso/gen_vdso_offsets.sh $kerneldir/build/ @@ -179,6 +179,8 @@ do_install() { cp -a include $kerneldir/build + cp -a --parents lib/vdso/* $kerneldir/build/ 2>/dev/null || : + cp -a --parents tools/include/tools/le_byteshift.h $kerneldir/build/ cp -a --parents tools/include/tools/be_byteshift.h $kerneldir/build/ @@ -240,6 +242,15 @@ do_install() { # Copy .config to include/config/auto.conf so "make prepare" is unnecessary. cp $kerneldir/build/.config $kerneldir/build/include/config/auto.conf + # make the scripts python3 safe. We won't be running these, and if they are + # left as /usr/bin/python rootfs assembly will fail, since we only have python3 + # in the RDEPENDS (and the python3 package does not include /usr/bin/python) + for ss in $(find $kerneldir/build/scripts -type f -name '*'); do + sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "$ss" + sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "$ss" + sed -i 's,/usr/bin/python,/usr/bin/env python3,' "$ss" + done + chown -R root:root ${D} } @@ -249,7 +260,7 @@ do_install[lockfiles] = "${TMPDIR}/kernel-scripts.lock" FILES_${PN} = "${KERNEL_BUILD_ROOT} ${KERNEL_SRC_PATH}" FILES_${PN}-dbg += "${KERNEL_BUILD_ROOT}*/build/scripts/*/.debug/*" -RDEPENDS_${PN} = "bc python flex bison ${TCLIBC}-utils" +RDEPENDS_${PN} = "bc python3 flex bison ${TCLIBC}-utils" # 4.15+ needs these next two RDEPENDS RDEPENDS_${PN} += "openssl-dev util-linux" # and x86 needs a bit more for 4.15+ diff --git a/poky/meta/recipes-kernel/linux/linux-dtb.inc b/poky/meta/recipes-kernel/linux/linux-dtb.inc deleted file mode 100644 index f1912775c..000000000 --- a/poky/meta/recipes-kernel/linux/linux-dtb.inc +++ /dev/null @@ -1,3 +0,0 @@ -python() { - bb.warn("You are using the linux-dtb.inc which is deprecated. You can safely remove it as the Device Tree support is automatically enabled when KERNEL_DEVICETREE is set.") -} diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb index 2268faf51..163f28056 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -39,7 +39,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64)" +COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64)" KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index 22f3bf195..cf5142cf8 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -1,4 +1,4 @@ -KBRANCH ?= "v5.0/standard/preempt-rt/base" +KBRANCH ?= "v5.2/standard/preempt-rt/base" require recipes-kernel/linux/linux-yocto.inc @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e6cb812b5532630b6fc6dfd7778d57a4907d3180" -SRCREV_meta ?= "7f6e97c357746382d4339e7e0463637e715acd4b" +SRCREV_machine ?= "c6eb169e914def00c37cc2917486c637d800d404" +SRCREV_meta ?= "a36c82128d9ccec878d1c0c4542b87d6cf5e9a7c" 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-5.0;destsuffix=${KMETA}" + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.0.19" +LINUX_VERSION ?= "5.2.10" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb index 33672c6d4..c2193c0c7 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -1,12 +1,12 @@ -KBRANCH ?= "v5.0/standard/tiny/base" -KBRANCH_qemuarm ?= "v5.0/standard/tiny/arm-versatile-926ejs" +KBRANCH ?= "v5.2/standard/tiny/base" +KBRANCH_qemuarm ?= "v5.2/standard/tiny/arm-versatile-926ejs" LINUX_KERNEL_TYPE = "tiny" KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.0.19" +LINUX_VERSION ?= "5.2.10" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,14 +15,14 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "b9001287984b0066814c8739f38d629de73739b7" -SRCREV_machine ?= "55dd15336b7301b686a0c183f5372b49c1003d03" -SRCREV_meta ?= "7f6e97c357746382d4339e7e0463637e715acd4b" +SRCREV_machine_qemuarm ?= "94d03154067049b417526f46429729d4ba1e09b7" +SRCREV_machine ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" +SRCREV_meta ?= "a36c82128d9ccec878d1c0c4542b87d6cf5e9a7c" 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-5.0;destsuffix=${KMETA}" + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.0.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb index 887e88e08..9a75f1781 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.0.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -1,36 +1,36 @@ -KBRANCH ?= "v5.0/standard/base" +KBRANCH ?= "v5.2/standard/base" require recipes-kernel/linux/linux-yocto.inc # board specific branches -KBRANCH_qemuarm ?= "v5.0/standard/arm-versatile-926ejs" -KBRANCH_qemuarm64 ?= "v5.0/standard/qemuarm64" -KBRANCH_qemumips ?= "v5.0/standard/mti-malta32" -KBRANCH_qemuppc ?= "v5.0/standard/qemuppc" -KBRANCH_qemuriscv64 ?= "v5.0/standard/base" -KBRANCH_qemux86 ?= "v5.0/standard/base" -KBRANCH_qemux86-64 ?= "v5.0/standard/base" -KBRANCH_qemumips64 ?= "v5.0/standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "d1ed980ad989252d42386c8bc63b2f5f11985ea4" -SRCREV_machine_qemuarm64 ?= "55dd15336b7301b686a0c183f5372b49c1003d03" -SRCREV_machine_qemumips ?= "1520e78195e64f27be46a46a8d6711c8470fb083" -SRCREV_machine_qemuppc ?= "55dd15336b7301b686a0c183f5372b49c1003d03" -SRCREV_machine_qemuriscv64 ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458" -SRCREV_machine_qemux86 ?= "55dd15336b7301b686a0c183f5372b49c1003d03" -SRCREV_machine_qemux86-64 ?= "55dd15336b7301b686a0c183f5372b49c1003d03" -SRCREV_machine_qemumips64 ?= "9d4105b32cf123a861bc754377d2f2e156278a7e" -SRCREV_machine ?= "55dd15336b7301b686a0c183f5372b49c1003d03" -SRCREV_meta ?= "7f6e97c357746382d4339e7e0463637e715acd4b" - -# remap qemuarm to qemuarma15 for the 5.0 kernel +KBRANCH_qemuarm ?= "v5.2/standard/arm-versatile-926ejs" +KBRANCH_qemuarm64 ?= "v5.2/standard/qemuarm64" +KBRANCH_qemumips ?= "v5.2/standard/mti-malta32" +KBRANCH_qemuppc ?= "v5.2/standard/qemuppc" +KBRANCH_qemuriscv64 ?= "v5.2/standard/base" +KBRANCH_qemux86 ?= "v5.2/standard/base" +KBRANCH_qemux86-64 ?= "v5.2/standard/base" +KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" + +SRCREV_machine_qemuarm ?= "d329dc7256dfef66dedb604cafea5b5685c57f9d" +SRCREV_machine_qemuarm64 ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" +SRCREV_machine_qemumips ?= "6a46b8261433131ea99e5725d3fd75969004617c" +SRCREV_machine_qemuppc ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" +SRCREV_machine_qemuriscv64 ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" +SRCREV_machine_qemux86 ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" +SRCREV_machine_qemux86-64 ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" +SRCREV_machine_qemumips64 ?= "06bd563009ffc480befa0d116faed18e63785739" +SRCREV_machine ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" +SRCREV_meta ?= "a36c82128d9ccec878d1c0c4542b87d6cf5e9a7c" + +# remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= "qemuarma15" 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-5.0;destsuffix=${KMETA}" + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.0.19" +LINUX_VERSION ?= "5.2.10" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" diff --git a/poky/meta/recipes-kernel/perf/perf.bb b/poky/meta/recipes-kernel/perf/perf.bb index 4e603f1a3..7f00df0f8 100644 --- a/poky/meta/recipes-kernel/perf/perf.bb +++ b/poky/meta/recipes-kernel/perf/perf.bb @@ -13,7 +13,7 @@ PR = "r9" PACKAGECONFIG ??= "scripting tui libunwind" PACKAGECONFIG[dwarf] = ",NO_DWARF=1" -PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python" +PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3" # gui support was added with kernel 3.6.35 # since 3.10 libnewt was replaced by slang # to cover a wide range of kernel we add both dependencies @@ -44,8 +44,8 @@ PROVIDES = "virtual/perf" inherit linux-kernel-base kernel-arch manpages # needed for building the tools/perf Python bindings -inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'pythonnative', '', d)} -inherit python-dir +inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'python3native', '', d)} +inherit python3-dir export PYTHON_SITEPACKAGES_DIR #kernel 3.1+ supports WERROR to disable warnings as errors @@ -94,6 +94,7 @@ EXTRA_OEMAKE += "\ 'sharedir=${@os.path.relpath(datadir, prefix)}' \ 'mandir=${@os.path.relpath(mandir, prefix)}' \ 'infodir=${@os.path.relpath(infodir, prefix)}' \ + ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'PYTHON=python3 PYTHON_CONFIG=python3-config', '', d)} \ " # During do_configure, we might run a 'make clean'. That often breaks @@ -132,7 +133,7 @@ do_install() { oe_runmake install # we are checking for this make target to be compatible with older perf versions if ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'true', 'false', d)} && grep -q install-python_ext ${S}/tools/perf/Makefile*; then - oe_runmake DESTDIR=${D} install-python_ext + oe_runmake DESTDIR=${D} install-python_ext fi } @@ -232,13 +233,19 @@ do_configure_prepend () { fi # use /usr/bin/env instead of version specific python - for s in `find ${S}/tools/perf/scripts/python/ -name '*.py'`; do - sed -i 's,/usr/bin/python2,/usr/bin/env python,' "${s}" + for s in `find ${S}/tools/perf/ -name '*.py'`; do + sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" + sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" + sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" done # unistd.h can be out of sync between libc-headers and the captured version in the perf source # so we copy it from the sysroot unistd.h to the perf unistd.h install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h + install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/include/uapi/asm-generic/unistd.h + + # bits.h can have the same issuen as unistd.h, so we make the tools variant take precedence + install -D -m0644 ${S}/tools/include/linux/bits.h ${S}/include/linux/bits.h } python do_package_prepend() { @@ -252,9 +259,9 @@ PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python" RDEPENDS_${PN} += "elfutils bash" RDEPENDS_${PN}-archive =+ "bash" -RDEPENDS_${PN}-python =+ "bash python python-modules ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python', '', d)}" +RDEPENDS_${PN}-python =+ "bash python3 python3-modules ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python3', '', d)}" RDEPENDS_${PN}-perl =+ "bash perl perl-modules" -RDEPENDS_${PN}-tests =+ "python" +RDEPENDS_${PN}-tests =+ "python3" RSUGGESTS_SCRIPTING = "${@bb.utils.contains('PACKAGECONFIG', 'scripting', '${PN}-perl ${PN}-python', '',d)}" RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}" diff --git a/poky/meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch b/poky/meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch deleted file mode 100644 index b4f2fbc06..000000000 --- a/poky/meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5eb10d90af9178edb65e6091ae939d1b5b19bb78 Mon Sep 17 00:00:00 2001 -From: Wenzong Fan <wenzong.fan@windriver.com> -Date: Tue, 23 Sep 2014 04:47:10 -0400 -Subject: [PATCH] systemtap: allow to disable libvirt - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> ---- - configure.ac | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a631ae7..cb4885b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -525,10 +525,15 @@ dnl Check for the libvirt and libxml2 devel packages - - dnl We require libvirt >= 1.0.2 because stapvirt relies on the - dnl virDomainOpenChannel function, which was implemented in 1.0.2. --PKG_CHECK_MODULES([libvirt], [libvirt >= 1.0.2], [ -- have_libvirt=yes -- AC_DEFINE([HAVE_LIBVIRT],[1],[Define to 1 if libvirt development libraries are installed]) -- ], [have_libvirt=no]) -+AC_ARG_ENABLE([libvirt], -+ AS_HELP_STRING([--disable-libvirt], [Do not use libvirt even if present])) -+ -+if test "$enable_libvirt" != no; then -+ PKG_CHECK_MODULES([libvirt], [libvirt >= 1.0.2], [ -+ have_libvirt=yes -+ AC_DEFINE([HAVE_LIBVIRT],[1],[Define to 1 if libvirt development libraries are installed]) -+ ], [have_libvirt=no]) -+fi - AM_CONDITIONAL([HAVE_LIBVIRT], [test "${have_libvirt}" = "yes"]) - PKG_CHECK_MODULES([libxml2], [libxml-2.0], [ - have_libxml2=yes --- -1.7.9.5 - diff --git a/poky/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch b/poky/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch deleted file mode 100644 index 9313a5aba..000000000 --- a/poky/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 93fc4744fedf6fc593ee656968da97f7b1862ada Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Tue, 4 Oct 2016 16:37:53 +0100 -Subject: [PATCH 4/6] systemtap: rationalise dependencies - -Add an option to explicitly disable the monitor (and therefore the dependency on -json-c and ncurses). - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - ---- - configure.ac | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac -@@ -766,13 +766,16 @@ dnl We want either (or both) python prob - AM_CONDITIONAL([HAVE_PYTHON_PROBES], - [test "x$have_python2_support" = "xyes" -o "x$have_python3_support" = "xyes"]) - -+AC_ARG_ENABLE([monitor], AS_HELP_STRING([--disable-monitor],[Disable monitor])) -+if test "$enable_monitor" != "no"; then - dnl Check for presence of json-c and ncurses for use in monitor mode - PKG_CHECK_MODULES([jsonc], [json-c >= 0.11], [have_jsonc=yes], [have_jsonc=no]) - PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no]) --AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes"]) - if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then - AC_DEFINE([HAVE_MONITOR_LIBS],[1],[Define to 1 if json-c and ncurses libraries are installed]) - fi -+fi -+AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes" -a "$enable_monitor" != "no"]) - - AC_CACHE_CHECK([for assembler .section "?" flags support], stap_cv_sectionq, [ - old_CFLAGS="$CFLAGS" diff --git a/poky/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch b/poky/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch deleted file mode 100644 index 2c860b19e..000000000 --- a/poky/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 43f1b04449bb1cf7e0092263f1c2a25f3fca08ef Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Tue, 8 Nov 2016 23:07:41 +0000 -Subject: [PATCH 5/6] systemtap: remove explicit msgfmt check - -There is no need to explicitly check that msgfmt was found as the gettext macros -handle this for us if NLS is enabled. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - ---- - configure.ac | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2ea9b3cbf..95417f59c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -36,10 +36,6 @@ AC_CHECK_FUNCS(openat) - AM_GNU_GETTEXT(external) - AM_GNU_GETTEXT_VERSION([0.19.4]) - --if test "x$GMSGFMT" = "x:"; then -- AC_MSG_ERROR([missing gnu /usr/bin/msgfmt]) --fi -- - # We want the 'PYTHON' varible to be python version 2. We also want - # our custom 'PYTHON3' varible to be python version 3. - # --- -2.11.0 - diff --git a/poky/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch b/poky/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch deleted file mode 100644 index 28a7eae40..000000000 --- a/poky/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fix time_t print because in x32 ABI is long long int instead of long int. - -Upstream-Status: Pending - -Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> - -diff --git a/cache.cxx b/cache.cxx -index 3546b30..19c77ca 100644 ---- a/cache.cxx -+++ b/cache.cxx -@@ -294,7 +294,11 @@ clean_cache(systemtap_session& s) - { - //interval not passed, don't continue - if (s.verbose > 1) -+#if defined(__x86_64__) && defined (__ILP32__) -+ clog << _F("Cache cleaning skipped, interval not reached %lld s / %lu s.", -+#else - clog << _F("Cache cleaning skipped, interval not reached %lu s / %lu s.", -+#endif - (current_time.tv_sec-sb.st_mtime), cache_clean_interval) << endl; - return; - } -@@ -302,7 +306,11 @@ clean_cache(systemtap_session& s) - { - //interval reached, continue - if (s.verbose > 1) -+#if defined(__x86_64__) && defined (__ILP32__) -+ clog << _F("Cleaning cache, interval reached %lld s > %lu s.", -+#else - clog << _F("Cleaning cache, interval reached %lu s > %lu s.", -+#endif - (current_time.tv_sec-sb.st_mtime), cache_clean_interval) << endl; - } - diff --git a/poky/meta/recipes-kernel/systemtap/systemtap_git.inc b/poky/meta/recipes-kernel/systemtap/systemtap_git.inc index c5348b320..abb2b3743 100644 --- a/poky/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/poky/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -1,13 +1,9 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "984d6d1696ed06626b07cb65ab55d6ae0ece1131" -PV = "4.1" +SRCREV = "57c9aca9f1ff32a6add10e02ecd33b7314fad499" +PV = "4.1+git${SRCPV}" SRC_URI = "git://sourceware.org/git/systemtap.git \ - file://configure-allow-to-disable-libvirt.patch \ - file://x32_abi_time.patch \ - file://monitor-option.patch \ - file://no-msgfmt-check.patch \ file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ file://0001-Install-python-modules-to-correct-library-dir.patch \ file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ diff --git a/poky/meta/recipes-multimedia/flac/flac/CVE-2017-6888.patch b/poky/meta/recipes-multimedia/flac/flac/CVE-2017-6888.patch deleted file mode 100644 index f01791680..000000000 --- a/poky/meta/recipes-multimedia/flac/flac/CVE-2017-6888.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 43ecb6431077ff54e9df27f71737e6e96d6c039f Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 21 Aug 2018 14:46:43 +0800 -Subject: [PATCH] From 5f47b63e9c971e6391590caf00a0f2a5ed612e67 Mon Sep 17 - 00:00:00 2001 From: Erik de Castro Lopo <erikd@mega-nerd.com> Date: Sat, 8 - Apr 2017 18:34:49 +1000 Subject: [PATCH] stream_decoder.c: Fix a memory leak - -Leak reported by Secunia Research. - -Upstream-Status: Backport[https://git.xiph.org/?p=flac.git;a=commit; - h=4f47b63e9c971e6391590caf00a0f2a5ed612e67] - -Update patch to version 1.3.2 -CVE: CVE-2017-6888 - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - src/libFLAC/stream_decoder.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c -index d364b0c..ebf93da 100644 ---- a/src/libFLAC/stream_decoder.c -+++ b/src/libFLAC/stream_decoder.c -@@ -1759,6 +1759,9 @@ FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__Stre - } - memset (obj->comments[i].entry, 0, obj->comments[i].length) ; - if (!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->comments[i].entry, obj->comments[i].length)) { -+ /* Current i-th entry is bad, so we delete it. */\ -+ free (obj->comments[i].entry) ; -+ obj->comments[i].entry = NULL ; - obj->num_comments = i; - goto skip; - } --- -2.7.4 - diff --git a/poky/meta/recipes-multimedia/flac/flac_1.3.2.bb b/poky/meta/recipes-multimedia/flac/flac_1.3.3.bb index e8599f6ba..fea2be1f6 100644 --- a/poky/meta/recipes-multimedia/flac/flac_1.3.2.bb +++ b/poky/meta/recipes-multimedia/flac/flac_1.3.3.bb @@ -15,11 +15,10 @@ LIC_FILES_CHKSUM = "file://COPYING.FDL;md5=ad1419ecc56e060eccf8184a87c4285f \ DEPENDS = "libogg" SRC_URI = "http://downloads.xiph.org/releases/flac/${BP}.tar.xz \ - file://CVE-2017-6888.patch " +" - -SRC_URI[md5sum] = "454f1bfa3f93cc708098d7890d0499bd" -SRC_URI[sha256sum] = "91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f" +SRC_URI[md5sum] = "26703ed2858c1fc9ffc05136d13daa69" +SRC_URI[sha256sum] = "213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748" CVE_PRODUCT = "libflac flac" diff --git a/poky/meta/recipes-multimedia/libogg/libogg_1.3.3.bb b/poky/meta/recipes-multimedia/libogg/libogg_1.3.4.bb index 8d88f1f9f..8ca001079 100644 --- a/poky/meta/recipes-multimedia/libogg/libogg_1.3.3.bb +++ b/poky/meta/recipes-multimedia/libogg/libogg_1.3.4.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=db1b7a668b2a6f47b2af88fb008ad555 \ SRC_URI = "http://downloads.xiph.org/releases/ogg/${BP}.tar.xz" -SRC_URI[md5sum] = "87ed742047f065046eb6c36745d871b8" -SRC_URI[sha256sum] = "4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08" +SRC_URI[md5sum] = "eadef24aad6e3e8379ba0d14971fd64a" +SRC_URI[sha256sum] = "c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe" inherit autotools pkgconfig diff --git a/poky/meta/recipes-rt/rt-tests/rt-tests_1.1.bb b/poky/meta/recipes-rt/rt-tests/rt-tests_1.1.bb index b673cd784..5aa0aa10c 100644 --- a/poky/meta/recipes-rt/rt-tests/rt-tests_1.1.bb +++ b/poky/meta/recipes-rt/rt-tests/rt-tests_1.1.bb @@ -14,6 +14,10 @@ SRC_URI += " \ file://run-ptest \ file://rt_bmark.py \ " + +# rt-tests needs PI mutex support in libc +COMPATIBLE_HOST_libc-musl = 'null' + # Do not install hwlatdetect EXTRA_OEMAKE += "PYLIB=''" diff --git a/poky/meta/recipes-sato/images/core-image-sato.bb b/poky/meta/recipes-sato/images/core-image-sato.bb index b89795028..673106eb6 100644 --- a/poky/meta/recipes-sato/images/core-image-sato.bb +++ b/poky/meta/recipes-sato/images/core-image-sato.bb @@ -10,3 +10,6 @@ inherit core-image TOOLCHAIN_HOST_TASK_append = " nativesdk-intltool nativesdk-glib-2.0" TOOLCHAIN_HOST_TASK_remove_task-populate-sdk-ext = " nativesdk-intltool nativesdk-glib-2.0" + +QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' +QB_MEM_qemumips = "-m 256" diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch index 664cea9c7..e7c668c04 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch @@ -1,4 +1,4 @@ -From d3796ad1a19233ee5d3492a5560d7ede882f89cf Mon Sep 17 00:00:00 2001 +From 4b5e02212a31b82fc9b3becad90542274816fc29 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 11 Aug 2016 17:13:51 +0300 Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under @@ -17,23 +17,23 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/cmake/GtkDoc.cmake b/Source/cmake/GtkDoc.cmake -index 2ee05550..6cb6313d 100644 +index b0fb31ca..6cb6313d 100644 --- a/Source/cmake/GtkDoc.cmake +++ b/Source/cmake/GtkDoc.cmake @@ -4,7 +4,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) add_custom_command( OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" DEPENDS ${DocumentationDependencies} -- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args} +- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args} + COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LD=${CMAKE_C_COMPILER}" "LDFLAGS=${CMAKE_C_LINK_FLAGS}" "RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args} COMMAND touch ${_stamp_name} WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" VERBATIM diff --git a/Tools/gtkdoc/gtkdoc.py b/Tools/gtkdoc/gtkdoc.py -index 81ee8cdc..3e11c2f0 100644 +index 054cafa1..416de7d1 100644 --- a/Tools/gtkdoc/gtkdoc.py +++ b/Tools/gtkdoc/gtkdoc.py -@@ -317,9 +317,9 @@ class GTKDoc(object): +@@ -320,9 +320,9 @@ class GTKDoc(object): additional_ldflags = '%s %s' % (additional_ldflags, arg) ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags current_ld_library_path = env.get('LD_LIBRARY_PATH') diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch deleted file mode 100644 index e550a0d45..000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4bc241539246f7a17d07357257ab47cb96bc4b69 Mon Sep 17 00:00:00 2001 -From: "ysuzuki@apple.com" <ysuzuki@apple.com> -Date: Thu, 18 Apr 2019 07:30:18 +0000 -Subject: [PATCH] Unreviewed, fix build failure - https://bugs.webkit.org/show_bug.cgi?id=195938 - -Including <array>. - -* bmalloc/AvailableMemory.cpp: - -git-svn-id: http://svn.webkit.org/repository/webkit/trunk@244422 268f45cc-cd09-0410-ab3c-d52691b4dbfc - -Upstream-Status: Backport [https://github.com/WebKit/webkit/commit/84c111dc0d83b5acf60706ef49bc2f5e91112471] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Source/bmalloc/bmalloc/AvailableMemory.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/bmalloc/bmalloc/AvailableMemory.cpp b/Source/bmalloc/bmalloc/AvailableMemory.cpp -index 595889fe..b72000d5 100644 ---- a/Source/bmalloc/bmalloc/AvailableMemory.cpp -+++ b/Source/bmalloc/bmalloc/AvailableMemory.cpp -@@ -32,6 +32,7 @@ - #include "PerProcess.h" - #include "Scavenger.h" - #include "Sizes.h" -+#include <array> - #include <mutex> - #if BOS(DARWIN) - #if BPLATFORM(IOS_FAMILY) --- -2.22.0 - diff --git a/poky/meta/recipes-sato/webkit/webkitgtk_2.24.3.bb b/poky/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb index 0e5ee5ba0..8c695ce9e 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk_2.24.3.bb +++ b/poky/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb @@ -23,11 +23,10 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://include_array.patch \ file://narrowing.patch \ file://0001-gstreamer-add-a-missing-format-string.patch \ - file://0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch \ " -SRC_URI[md5sum] = "e2a5bbd09a217eba096a2d1562143e35" -SRC_URI[sha256sum] = "940d746d7e82c357222feb5b3f44c4b201e81df7d81ddca5ca2bf3ae0acf6c51" +SRC_URI[md5sum] = "c214963d8c0e7d83460da04a0d8dda87" +SRC_URI[sha256sum] = "8668b129c026624ec226a4cccf4995f9d26f3e88fc28ab75b0e965f3c32b7dd8" inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc @@ -69,7 +68,7 @@ EXTRA_OECMAKE = " \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \ -DENABLE_MINIBROWSER=ON \ - -DPYTHON_EXECUTABLE=`which python` \ + -DPYTHON_EXECUTABLE=`which python3` \ " # Javascript JIT is not supported on ARC diff --git a/poky/meta/recipes-support/boost/bjam-native_1.69.0.bb b/poky/meta/recipes-support/boost/bjam-native_1.71.0.bb index 94f96e62d..d843eb038 100644 --- a/poky/meta/recipes-support/boost/bjam-native_1.69.0.bb +++ b/poky/meta/recipes-support/boost/bjam-native_1.71.0.bb @@ -5,8 +5,9 @@ SECTION = "devel" inherit native -SRC_URI += "file://bjam-native-build-bjam.debug.patch \ -" +SRC_URI += "file://0001-Build-debug-version-of-bjam.patch \ + file://0001-build.sh-use-DNDEBUG-also-in-debug-builds.patch \ + " do_compile() { ./bootstrap.sh --with-toolset=gcc @@ -15,5 +16,5 @@ do_compile() { do_install() { install -d ${D}${bindir}/ # install unstripped version for bjam - install -c -m 755 bjam.debug ${D}${bindir}/bjam + install -c -m 755 b2 ${D}${bindir}/bjam } diff --git a/poky/meta/recipes-support/boost/boost-1.69.0.inc b/poky/meta/recipes-support/boost/boost-1.71.0.inc index 923436b1e..7164d0f1c 100644 --- a/poky/meta/recipes-support/boost/boost-1.69.0.inc +++ b/poky/meta/recipes-support/boost/boost-1.71.0.inc @@ -11,9 +11,9 @@ BOOST_VER = "${@"_".join(d.getVar("PV").split("."))}" BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" -SRC_URI[md5sum] = "a1332494397bf48332cb152abfefcec2" -SRC_URI[sha256sum] = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406" +SRC_URI = "https://dl.bintray.com/boostorg/release/${PV}/source/${BOOST_P}.tar.bz2" +SRC_URI[md5sum] = "4cdf9b5c2dc01fb2b7b733d5af30e558" +SRC_URI[sha256sum] = "d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" diff --git a/poky/meta/recipes-support/boost/boost.inc b/poky/meta/recipes-support/boost/boost.inc index f38554165..e15dce4e1 100644 --- a/poky/meta/recipes-support/boost/boost.inc +++ b/poky/meta/recipes-support/boost/boost.inc @@ -83,7 +83,7 @@ FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ # -dev last to pick up the remaining stuff PACKAGES += "${PN}-dev ${PN}-staticdev" -FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so" +FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/cmake" FILES_${PN}-staticdev = "${libdir}/libboost_*.a" # "boost" is a metapackage which pulls in all boost librabries diff --git a/poky/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/poky/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch index 8944cb37b..68d6e6417 100644 --- a/poky/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +++ b/poky/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch @@ -1,4 +1,4 @@ -From 3e4eb02eb5951058bc6f8dffbf049eb189df8291 Mon Sep 17 00:00:00 2001 +From f4d3fad43d67808d71325ba0df1457555b9a0086 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 18 Dec 2018 15:42:57 +0100 Subject: [PATCH] Don't set up arch/instruction-set flags, we do that ourselves @@ -6,15 +6,16 @@ Subject: [PATCH] Don't set up arch/instruction-set flags, we do that ourselves Upstream-Status: Inappropriate Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- - tools/build/src/tools/gcc.jam | 128 ---------------------------------- - 1 file changed, 128 deletions(-) + tools/build/src/tools/gcc.jam | 132 ---------------------------------- + 1 file changed, 132 deletions(-) diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index c57c773f..28618fb1 100644 +index b9bb9cf2a..c7e3cf3fe 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam -@@ -1152,131 +1152,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : +@@ -1180,135 +1180,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : <architecture>$(architecture)/<instruction-set>$(instruction-set) : $(values) ; } @@ -144,5 +145,9 @@ index c57c773f..28618fb1 100644 -cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ; -cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ; -cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ; +-cpu-flags gcc OPTIONS : s390x : z196 : -march=z196 ; +-cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ; +-cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ; +-cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ; -# AIX variant of RS/6000 & PowerPC -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; diff --git a/poky/meta/recipes-support/boost/boost_1.69.0.bb b/poky/meta/recipes-support/boost/boost_1.71.0.bb index 324b46f16..324b46f16 100644 --- a/poky/meta/recipes-support/boost/boost_1.69.0.bb +++ b/poky/meta/recipes-support/boost/boost_1.71.0.bb diff --git a/poky/meta/recipes-support/boost/files/0001-Build-debug-version-of-bjam.patch b/poky/meta/recipes-support/boost/files/0001-Build-debug-version-of-bjam.patch new file mode 100644 index 000000000..c6dcee915 --- /dev/null +++ b/poky/meta/recipes-support/boost/files/0001-Build-debug-version-of-bjam.patch @@ -0,0 +1,38 @@ +From 19c117c3d1388654da484e26afb3fb6c3e4181a9 Mon Sep 17 00:00:00 2001 +From: Daniel Klauer <daniel.klauer@gin.de> +Date: Tue, 30 Jul 2019 11:39:09 +0200 +Subject: [PATCH] Build debug version of bjam + +bjam is stripped by default, this causes QA warning while stripping it +from do_populate_sysroot(): + + WARNING: File '.../tmp/sysroots/x86_64-linux/usr/bin/bjam' \ + from bjam-native was already stripped, \ + this will prevent future debugging! + +The JAM scripts allow to build unstripped version with '--debug'. Just +build and install the bjam.debug to stop bjam from being stripped in +compile step. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + bootstrap.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bootstrap.sh b/bootstrap.sh +index ca0b08d58..87f38dcf2 100755 +--- a/bootstrap.sh ++++ b/bootstrap.sh +@@ -223,7 +223,7 @@ rm -f config.log + if test "x$BJAM" = x; then + $ECHO -n "Building Boost.Build engine with toolset $TOOLSET... " + pwd=`pwd` +- (cd "$my_dir/tools/build/src/engine" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1 ++ (cd "$my_dir/tools/build/src/engine" && ./build.sh "$TOOLSET" --debug) > bootstrap.log 2>&1 + if [ $? -ne 0 ]; then + echo + echo "Failed to build Boost.Build build engine" +-- +2.17.1 + diff --git a/poky/meta/recipes-support/boost/files/0001-build.sh-use-DNDEBUG-also-in-debug-builds.patch b/poky/meta/recipes-support/boost/files/0001-build.sh-use-DNDEBUG-also-in-debug-builds.patch new file mode 100644 index 000000000..4c6ef2ed8 --- /dev/null +++ b/poky/meta/recipes-support/boost/files/0001-build.sh-use-DNDEBUG-also-in-debug-builds.patch @@ -0,0 +1,27 @@ +From 2afd025997a57794ce24e07e914b461dfea6ba5f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 26 Aug 2019 16:04:16 +0200 +Subject: [PATCH] build.sh: use -DNDEBUG also in debug builds + +Without it, there is a significant performance regression +when running 'bjam install'. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + tools/build/src/engine/build.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh +index a1e4cd335..64e0a4c80 100755 +--- a/tools/build/src/engine/build.sh ++++ b/tools/build/src/engine/build.sh +@@ -436,7 +436,7 @@ case $B2_OS in + ;; + esac + +-if check_debug_build "$@" ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG}" ++if check_debug_build "$@" ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG} -DNDEBUG" + else B2_CXXFLAGS="${B2_CXXFLAGS_RELEASE} -DNDEBUG" + fi + echo_run ${B2_CXX} ${CXXFLAGS} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2 diff --git a/poky/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch b/poky/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch deleted file mode 100644 index 9f8b7eac0..000000000 --- a/poky/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 619ada314ab26c0c9cbfe5702cd9c0caa8f6415a Mon Sep 17 00:00:00 2001 -From: Wenzong Fan <wenzong.fan@windriver.com> -Date: Mon, 3 Aug 2015 17:12:33 +0800 -Subject: [PATCH] bjam-native: build bjam.debug - -bjam is stripped by default, this causes QA warning while stripping it -from do_populate_sysroot(): - - WARNING: File '.../tmp/sysroots/x86_64-linux/usr/bin/bjam' \ - from bjam-native was already stripped, \ - this will prevent future debugging! - -The JAM scripts allow to build unstripped version with '--debug'. Just -build and install the bjam.debug to stop bjam from being stripped in -compile step. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> ---- - bootstrap.sh | 1 + - tools/build/src/engine/build.sh | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/bootstrap.sh b/bootstrap.sh -index 98cf88b..54690aa 100755 ---- a/bootstrap.sh -+++ b/bootstrap.sh -@@ -228,6 +228,7 @@ if test "x$BJAM" = x; then - echo "tools/build/src/engine/$arch/b2" - cp "$BJAM" . - cp "$my_dir/tools/build/src/engine/$arch/bjam" . -+ cp "$my_dir/tools/build/src/engine/${arch}.debug/bjam" bjam.debug - - fi - -diff --git a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh -index 6dbc706..c69fdc7 100755 ---- a/tools/build/src/engine/build.sh -+++ b/tools/build/src/engine/build.sh -@@ -312,5 +312,5 @@ if test -x "./bootstrap/jam0" ; then - if test "${BJAM_UPDATE}" != "update" ; then - echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@" clean - fi -- echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@" -+ echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@" --debug - fi --- -1.9.1 - diff --git a/poky/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch b/poky/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch new file mode 100644 index 000000000..aa2c85ff4 --- /dev/null +++ b/poky/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch @@ -0,0 +1,37 @@ +From b6d18ca77f131cdcaa10d0eaa9d303399767edf6 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 28 Aug 2019 19:18:14 +0200 +Subject: [PATCH] certdata2pem.py: use python3 + +Comments in that file imply it is already py3 compatible. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + mozilla/Makefile | 2 +- + mozilla/certdata2pem.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mozilla/Makefile b/mozilla/Makefile +index 6f46118..f98877c 100644 +--- a/mozilla/Makefile ++++ b/mozilla/Makefile +@@ -3,7 +3,7 @@ + # + + all: +- python certdata2pem.py ++ python3 certdata2pem.py + + clean: + -rm -f *.crt +diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py +index 0b02b2a..7d796f1 100644 +--- a/mozilla/certdata2pem.py ++++ b/mozilla/certdata2pem.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + # vim:set et sw=4: + # + # certdata2pem.py - splits certdata.txt into multiple files diff --git a/poky/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb b/poky/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb index efd9eaa71..ce3cb217a 100644 --- a/poky/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb +++ b/poky/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb @@ -23,6 +23,7 @@ SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \ file://default-sysroot.patch \ file://sbindir.patch \ file://0003-update-ca-certificates-use-relative-symlinks-from-ET.patch \ + file://0001-certdata2pem.py-use-python3.patch \ " S = "${WORKDIR}/git" @@ -53,7 +54,7 @@ do_install () { echo "# Lines starting with ! will remove certificate on next update" echo "#" find ${D}${datadir}/ca-certificates -type f -name '*.crt' | \ - sed 's,^${D}${datadir}/ca-certificates/,,' + sed 's,^${D}${datadir}/ca-certificates/,,' | sort } >${D}${sysconfdir}/ca-certificates.conf } diff --git a/poky/meta/recipes-support/libbsd/libbsd/0001-flopen-Add-missing-fcntl.h-include.patch b/poky/meta/recipes-support/libbsd/libbsd/0001-flopen-Add-missing-fcntl.h-include.patch deleted file mode 100644 index 8abb876c7..000000000 --- a/poky/meta/recipes-support/libbsd/libbsd/0001-flopen-Add-missing-fcntl.h-include.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 13c32916b4baab58d93940d57fea9ff0777f1931 Mon Sep 17 00:00:00 2001 -From: Baruch Siach <baruch@tkos.co.il> -Date: Tue, 5 Jun 2018 19:21:46 +0300 -Subject: [PATCH] flopen: Add missing <fcntl.h> include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit 993828d84ee (Add flopenat() function from FreeBSD) dropped the -fcntl.h header. This breaks the build with musl libc: - -flopen.c: In function ‘vflopenat’: -flopen.c:60:14: error: ‘O_CREAT’ undeclared (first use in this function) - if (flags & O_CREAT) { - ^~~~~~~ - -Restore the fcntl.h header include to fix the build. - -Fixes: commit 993828d84eed0468c6c15b2818e534e6b134b8e4 -Submitted-also-by: parazyd <parazyd@dyne.org> -Signed-off-by: Baruch Siach <baruch@tkos.co.il> -Signed-off-by: Guillem Jover <guillem@hadrons.org> - -Upstream-Status: Backport -[https://gitlab.freedesktop.org/libbsd/libbsd/commit/13c32916b4baab58d93940d57fea9ff0777f1931] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - src/flopen.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/flopen.c b/src/flopen.c -index b9972c9..ff20d07 100644 ---- a/src/flopen.c -+++ b/src/flopen.c -@@ -32,6 +32,7 @@ - #include <sys/stat.h> - - #include <errno.h> -+#include <fcntl.h> - #include <stdarg.h> - #include <unistd.h> - --- -2.7.4 - diff --git a/poky/meta/recipes-support/libbsd/libbsd_0.9.1.bb b/poky/meta/recipes-support/libbsd/libbsd_0.10.0.bb index 2b75cdf95..eaf244a3b 100644 --- a/poky/meta/recipes-support/libbsd/libbsd_0.9.1.bb +++ b/poky/meta/recipes-support/libbsd/libbsd_0.10.0.bb @@ -28,16 +28,13 @@ HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" # License: public-domain # License: public-domain-Colin-Plumb LICENSE = "BSD-4-Clause & ISC & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=b552602fda69e34c753d26de383f33c5" +LIC_FILES_CHKSUM = "file://COPYING;md5=2120be0173469a06ed185b688e0e1ae0" SECTION = "libs" -SRC_URI = " \ - http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://0001-flopen-Add-missing-fcntl.h-include.patch \ -" +SRC_URI = "http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "a74b80c4143afa032c90226a4518fffe" -SRC_URI[sha256sum] = "56d835742327d69faccd16955a60b6dcf30684a8da518c4eca0ac713b9e0a7a4" +SRC_URI[md5sum] = "ead96d240d02faa5b921c0aa50c812b5" +SRC_URI[sha256sum] = "34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887" inherit autotools pkgconfig diff --git a/poky/meta/recipes-support/libevdev/libevdev_1.7.0.bb b/poky/meta/recipes-support/libevdev/libevdev_1.8.0.bb index abd6f386b..84274987d 100644 --- a/poky/meta/recipes-support/libevdev/libevdev_1.7.0.bb +++ b/poky/meta/recipes-support/libevdev/libevdev_1.8.0.bb @@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ file://libevdev/libevdev.h;endline=21;md5=7ff4f0b5113252c2f1a828e0bbad98d1" SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" - -SRC_URI[md5sum] = "fabe87d8d7d7f7cdb4a26e5dc99fc517" -SRC_URI[sha256sum] = "11dbe1f2b1d03a51f3e9a196757a75c3a999042ce34cf1fdc00a2363e5a2e369" +SRC_URI[md5sum] = "879631080be18526737e33b63d848039" +SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" inherit autotools pkgconfig diff --git a/poky/meta/recipes-support/libevent/libevent/run-ptest b/poky/meta/recipes-support/libevent/libevent/run-ptest index 0241851c7..080806dea 100644 --- a/poky/meta/recipes-support/libevent/libevent/run-ptest +++ b/poky/meta/recipes-support/libevent/libevent/run-ptest @@ -1,18 +1,28 @@ #!/bin/sh -fail=0 +# run-ptest - 'ptest' test infrastructure shell script that +# wraps the libevent test scripts +# +# Trevor Gamblin <trevor.gamblin@windriver.com> +############################################################### +LIBEVENTLIB=@libdir@/libevent +LOG="${LIBEVENTLIB}/ptest/libevent_ptest_$(date +%Y%m%d-%H%M%S).log" + +cd ${LIBEVENTLIB}/ptest + for test in ./test/* do - $test - if [ $? -ne 0 ] - then - fail=1 - fi + $test 2>&1| sed -e '/OK/ s/^/PASS: / ; /FAILED/ s/^/FAIL: / ; /SKIPPED/ s/^/SKIP: / ; /DISABLED/ s/^/SKIP: /' | cut -f1,2 -d ':' | tee -a ${LOG} done -if [ $fail -eq 0 ] -then - echo "PASS: libevent" -else - echo "FAIL: libevent" -fi +passed=`grep PASS ${LOG}|wc -l` +failed=`grep FAIL ${LOG}|wc -l` +skipped=`grep -E SKIP ${LOG}|wc -l` +all=$((passed + failed + skipped)) + +( echo "=== Test Summary ===" + echo "TOTAL: ${all}" + echo "PASSED: ${passed}" + echo "FAILED: ${failed}" + echo "SKIPPED: ${skipped}" +) | tee -a ${LOG} diff --git a/poky/meta/recipes-support/libevent/libevent_2.1.11.bb b/poky/meta/recipes-support/libevent/libevent_2.1.11.bb index 1e18f0ab2..f005ab8bd 100644 --- a/poky/meta/recipes-support/libevent/libevent_2.1.11.bb +++ b/poky/meta/recipes-support/libevent/libevent_2.1.11.bb @@ -43,4 +43,7 @@ do_install_ptest() { do install -m 0755 $file ${D}${PTEST_PATH}/test done + + # handle multilib + sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest } diff --git a/poky/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch b/poky/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch new file mode 100644 index 000000000..00a30a355 --- /dev/null +++ b/poky/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch @@ -0,0 +1,31 @@ +From 4149a7627a998731cc246d3f58a36808745d04c8 Mon Sep 17 00:00:00 2001 +From: Carl Hurd <carl@Carls-MacBook-Pro.local> +Date: Wed, 18 Jul 2018 09:04:32 -0400 +Subject: [PATCH] Fixed missed #ifndef for __mips_soft_float + +Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> +--- +Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/442] + + src/mips/o32.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/mips/o32.S b/src/mips/o32.S +index 44e74cb..799139b 100644 +--- a/src/mips/o32.S ++++ b/src/mips/o32.S +@@ -282,9 +282,11 @@ $LCFI12: + li $13, 1 # FFI_O32 + bne $16, $13, 1f # Skip fp save if FFI_O32_SOFT_FLOAT + ++#ifndef __mips_soft_float + # Store all possible float/double registers. + s.d $f12, FA_0_0_OFF2($fp) + s.d $f14, FA_1_0_OFF2($fp) ++#endif + 1: + # prepare arguments for ffi_closure_mips_inner_O32 + REG_L a0, 4($15) # cif +-- +2.21.0 + diff --git a/poky/meta/recipes-support/libffi/libffi_3.3~rc0.bb b/poky/meta/recipes-support/libffi/libffi_3.3~rc0.bb index dadde0b2a..8acb699d4 100644 --- a/poky/meta/recipes-support/libffi/libffi_3.3~rc0.bb +++ b/poky/meta/recipes-support/libffi/libffi_3.3~rc0.bb @@ -12,9 +12,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3610bb17683a0089ed64055416b2ae1b" SRC_URI = "https://github.com/libffi/libffi/releases/download/v3.3-rc0/libffi-3.3-rc0.tar.gz \ file://not-win32.patch \ + file://0001-Fixed-missed-ifndef-for-__mips_soft_float.patch \ " SRC_URI[md5sum] = "8d2a82a78faf10a5e53c27d986e8f04e" SRC_URI[sha256sum] = "403d67aabf1c05157855ea2b1d9950263fb6316536c8c333f5b9ab1eb2f20ecf" +UPSTREAM_CHECK_URI = "https://github.com/libffi/libffi/releases/" +UPSTREAM_CHECK_REGEX = "libffi-(?P<pver>\d+(\.\d+)+)\.tar" +UPSTREAM_VERSION_UNKNOWN = "1" EXTRA_OECONF += "--disable-builddir" EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'" diff --git a/poky/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/poky/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch new file mode 100644 index 000000000..b936d1143 --- /dev/null +++ b/poky/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch @@ -0,0 +1,144 @@ +Upstream-Status: Backport [https://dev.gnupg.org/T4459] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <gniibe@fsij.org> +Date: Mon, 15 Apr 2019 15:10:44 +0900 +Subject: [PATCH] awk: Prepare for Gawk 5.0. + +* src/Makefile.am: Use pkg_namespace (instead of namespace). +* src/mkerrnos.awk: Likewise. +* lang/cl/mkerrcodes.awk: Don't escape # in regexp. +* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. + +-- + +In Gawk 5.0, regexp routines are replaced by Gnulib implementation, +which only allows escaping specific characters. + +GnuPG-bug-id: 4459 +Reported-by: Marius Schamschula +Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> +--- + lang/cl/mkerrcodes.awk | 2 +- + src/Makefile.am | 2 +- + src/mkerrcodes.awk | 2 +- + src/mkerrcodes1.awk | 2 +- + src/mkerrcodes2.awk | 2 +- + src/mkerrnos.awk | 2 +- + src/mkstrtable.awk | 10 +++++----- + 7 files changed, 11 insertions(+), 11 deletions(-) + +--- a/lang/cl/mkerrcodes.awk ++++ b/lang/cl/mkerrcodes.awk +@@ -122,7 +122,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO + + errnos-sym.h: Makefile mkstrtable.awk errnos.in + $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ +- -v prefix=GPG_ERR_ -v namespace=errnos_ \ ++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ + $(srcdir)/errnos.in >$@ + + +--- a/src/mkerrcodes.awk ++++ b/src/mkerrcodes.awk +@@ -85,7 +85,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +--- a/src/mkerrcodes1.awk ++++ b/src/mkerrcodes1.awk +@@ -81,7 +81,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +--- a/src/mkerrcodes2.awk ++++ b/src/mkerrcodes2.awk +@@ -91,7 +91,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +--- a/src/mkerrnos.awk ++++ b/src/mkerrnos.awk +@@ -83,7 +83,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +--- a/src/mkstrtable.awk ++++ b/src/mkstrtable.awk +@@ -77,7 +77,7 @@ + # + # The variable prefix can be used to prepend a string to each message. + # +-# The variable namespace can be used to prepend a string to each ++# The variable pkg_namespace can be used to prepend a string to each + # variable and macro name. + + BEGIN { +@@ -102,7 +102,7 @@ header { + print "/* The purpose of this complex string table is to produce"; + print " optimal code with a minimum of relocations. */"; + print ""; +- print "static const char " namespace "msgstr[] = "; ++ print "static const char " pkg_namespace "msgstr[] = "; + header = 0; + } + else +@@ -110,7 +110,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +@@ -150,7 +150,7 @@ END { + else + print " gettext_noop (\"" last_msgstr "\");"; + print ""; +- print "static const int " namespace "msgidx[] ="; ++ print "static const int " pkg_namespace "msgidx[] ="; + print " {"; + for (i = 0; i < coded_msgs; i++) + print " " pos[i] ","; +@@ -158,7 +158,7 @@ END { + print " };"; + print ""; + print "static GPG_ERR_INLINE int"; +- print namespace "msgidxof (int code)"; ++ print pkg_namespace "msgidxof (int code)"; + print "{"; + print " return (0 ? 0"; + diff --git a/poky/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/poky/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb index 2db544a12..b11ab0548 100644 --- a/poky/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb +++ b/poky/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb @@ -14,6 +14,7 @@ SECTION = "libs" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ + file://libgpg-error-1.36-gawk5-support.patch \ " SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed" diff --git a/poky/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch b/poky/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch deleted file mode 100644 index b20a29962..000000000 --- a/poky/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch +++ /dev/null @@ -1,38 +0,0 @@ -Subject: [PATCH] fix libnl-3.4.0 musl compile problem -Avoid in6_addr redefinition - -Upstream-Status: Pending - -Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> ---- - include/linux-private/linux/if_bridge.h | 1 - - include/linux-private/linux/ipv6.h | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/include/linux-private/linux/if_bridge.h b/include/linux-private/linux/if_bridge.h -index f24050b..8f7490c 100644 ---- a/include/linux-private/linux/if_bridge.h -+++ b/include/linux-private/linux/if_bridge.h -@@ -15,7 +15,6 @@ - - #include <linux/types.h> - #include <linux/if_ether.h> --#include <linux/in6.h> - - #define SYSFS_BRIDGE_ATTR "bridge" - #define SYSFS_BRIDGE_FDB "brforward" -diff --git a/include/linux-private/linux/ipv6.h b/include/linux-private/linux/ipv6.h -index e05e684..f16349d 100644 ---- a/include/linux-private/linux/ipv6.h -+++ b/include/linux-private/linux/ipv6.h -@@ -2,7 +2,6 @@ - #define _IPV6_H - - #include <asm/byteorder.h> --#include <linux/in6.h> - - /* The latest drafts declared increase in minimal mtu up to 1280. */ - --- -2.7.4 - diff --git a/poky/meta/recipes-support/libnl/libnl/fix-pc-file.patch b/poky/meta/recipes-support/libnl/libnl/fix-pc-file.patch deleted file mode 100644 index fe8b833a1..000000000 --- a/poky/meta/recipes-support/libnl/libnl/fix-pc-file.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Pending - -Some packages are asking only for libnl-2.0, but expects to get also -libnl-genl, libnl-nf libnl-route, easiest way to fix them is here. - -Signed-off-by: Martin Jansa <martin.jansa@gmail.com> -Index: libnl-3.2.14/libnl-3.0.pc.in -=================================================================== ---- libnl-3.2.14.orig/libnl-3.0.pc.in -+++ libnl-3.2.14/libnl-3.0.pc.in -@@ -6,5 +6,5 @@ includedir=@includedir@ - Name: libnl - Description: Convenience library for netlink sockets - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lnl-@MAJ_VERSION@ -+Libs: -L${libdir} -lnl-@MAJ_VERSION@ -lnl-genl-@MAJ_VERSION@ -lnl-nf-@MAJ_VERSION@ -lnl-route-@MAJ_VERSION@ - Cflags: -I${includedir}/libnl@MAJ_VERSION@ diff --git a/poky/meta/recipes-support/libnl/libnl_3.4.0.bb b/poky/meta/recipes-support/libnl/libnl_3.5.0.bb index 90dc644be..c0609c4d9 100644 --- a/poky/meta/recipes-support/libnl/libnl_3.4.0.bb +++ b/poky/meta/recipes-support/libnl/libnl_3.5.0.bb @@ -9,16 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "flex-native bison-native" -SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ - file://fix-pc-file.patch \ - file://0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch \ -" +SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz" +SRC_URI[md5sum] = "74ba57b1b1d6f9f92268aa8141d8e8e4" +SRC_URI[sha256sum] = "352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa" UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" -SRC_URI[md5sum] = "8f71910c03db363b41e2ea62057a4311" -SRC_URI[sha256sum] = "b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf" - inherit autotools pkgconfig FILES_${PN} = "${libdir}/libnl-3.so.* \ diff --git a/poky/meta/recipes-support/libpsl/libpsl/0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch b/poky/meta/recipes-support/libpsl/libpsl/0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch new file mode 100644 index 000000000..6d6ccf4d2 --- /dev/null +++ b/poky/meta/recipes-support/libpsl/libpsl/0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch @@ -0,0 +1,50 @@ +From a0e6f0ec9dc6dd1db1c03f7f273cc16cb3af5561 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Thu, 11 Jul 2019 17:47:11 +0100 +Subject: [PATCH] Makefile.am: use PYTHON when invoking psl-make-dafsa + +In an environment where only Python 3 is installed, configure.ac finds and sets +PYTHON=python3 correctly but src/psl-make-dafsa is called directly, so the hashbang of +`#!/usr/bin/env python` is used which doesn't exist. + +Fix this by explicitly running $(PYTHON) when using the tool. + +Upstream-Status: Backport [https://github.com/rockdaboot/libpsl/commit/b4fec5d0ddb70fc4f5360eb14f2f5c5e91194333] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + src/Makefile.am | 2 +- + tests/Makefile.am | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index f9c0a3d..a05ea05 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -19,7 +19,7 @@ libpsl_la_LDFLAGS = -no-undefined -version-info $(LIBPSL_SO_VERSION) + # Build rule for suffix_dafsa.c + # PSL_FILE can be set by ./configure --with-psl-file=[PATH] + suffixes_dafsa.h: $(PSL_FILE) $(srcdir)/psl-make-dafsa +- $(srcdir)/psl-make-dafsa --output-format=cxx+ "$(PSL_FILE)" suffixes_dafsa.h ++ $(PYTHON) $(srcdir)/psl-make-dafsa --output-format=cxx+ "$(PSL_FILE)" suffixes_dafsa.h + + EXTRA_DIST = psl-make-dafsa LICENSE.chromium + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 8b29b61..28a9a0b 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -34,9 +34,9 @@ TESTS = $(PSL_TESTS) + # check-local target works in parallel to the tests, so the test suite will likely fail + BUILT_SOURCES = psl.dafsa psl_ascii.dafsa + psl.dafsa: $(top_srcdir)/list/public_suffix_list.dat +- $(top_srcdir)/src/psl-make-dafsa --output-format=binary "$(PSL_FILE)" psl.dafsa ++ $(PYTHON) $(top_srcdir)/src/psl-make-dafsa --output-format=binary "$(PSL_FILE)" psl.dafsa + psl_ascii.dafsa: $(top_srcdir)/list/public_suffix_list.dat +- $(top_srcdir)/src/psl-make-dafsa --output-format=binary --encoding=ascii "$(PSL_FILE)" psl_ascii.dafsa ++ $(PYTHON) $(top_srcdir)/src/psl-make-dafsa --output-format=binary --encoding=ascii "$(PSL_FILE)" psl_ascii.dafsa + + clean-local: + rm -f psl.dafsa psl_ascii.dafsa +-- +2.17.1 + diff --git a/poky/meta/recipes-support/libpsl/libpsl_0.21.0.bb b/poky/meta/recipes-support/libpsl/libpsl_0.21.0.bb index fc2417fc2..9831b4b94 100644 --- a/poky/meta/recipes-support/libpsl/libpsl_0.21.0.bb +++ b/poky/meta/recipes-support/libpsl/libpsl_0.21.0.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5437030d9e4fbe7267ced058ddb8a7f5 \ SRC_URI = "https://github.com/rockdaboot/${BPN}/releases/download/${BP}/${BP}.tar.gz \ file://0001-gtk-doc-do-not-include-tree_index.sgml.patch \ + file://0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch \ " SRC_URI[md5sum] = "171e96d887709e36a57f4ee627bf82d2" SRC_URI[sha256sum] = "41bd1c75a375b85c337b59783f5deb93dbb443fb0a52d257f403df7bd653ee12" diff --git a/poky/meta/recipes-support/sqlite/sqlite3.inc b/poky/meta/recipes-support/sqlite/sqlite3.inc index 7cf23d044..4af1e09e8 100644 --- a/poky/meta/recipes-support/sqlite/sqlite3.inc +++ b/poky/meta/recipes-support/sqlite/sqlite3.inc @@ -19,7 +19,7 @@ UPSTREAM_CHECK_REGEX = "releaselog/(?P<pver>(\d+[\.\-_]*)+)\.html" CVE_PRODUCT = "sqlite" -inherit autotools pkgconfig +inherit autotools pkgconfig siteinfo # enable those which are enabled by default in configure PACKAGECONFIG ?= "fts4 fts5 json1 rtree dyn_ext" @@ -47,10 +47,14 @@ EXTRA_OECONF = " \ CFLAGS_append = " -fPIC" # pread() is in POSIX.1-2001 so any reasonable system must surely support it -CFLAGS += "-DUSE_PREAD" +CFLAGS_append = " -DUSE_PREAD" # Provide column meta-data API -CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" +CFLAGS_append = " -DSQLITE_ENABLE_COLUMN_METADATA" + +# Unless SQLITE_BYTEORDER is predefined, the code falls back to build time +# huristics, which are not always correct +CFLAGS_append = " ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-DSQLITE_BYTEORDER=1234', '-DSQLITE_BYTEORDER=4321', d)}" PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN}-dbg lib${BPN}-staticdev ${PN}" diff --git a/poky/meta/recipes.txt b/poky/meta/recipes.txt index 9e178d6ce..fb2c25014 100644 --- a/poky/meta/recipes.txt +++ b/poky/meta/recipes.txt @@ -3,11 +3,10 @@ recipes-connectivity - Libraries and applications related to communication with recipes-core - What's needed to build a basic working Linux image including commonly used dependencies recipes-devtools - Tools primarily used by the build system (but can also be used on targets) recipes-extended - Applications which whilst not essential add features compared to the alternatives in - core. May be needed for full tool functionality or LSB compliance. + core. May be needed for full tool functionality. recipes-gnome - All things related to the GTK+ application framework recipes-graphics - X and other graphically related system libraries recipes-kernel - The kernel and generic applications/libraries with strong kernel dependencies -recipes-lsb4 - Recipes added for the sole purpose of supporting the Linux Standard Base (LSB) 4.x recipes-multimedia - Codecs and support utilties for audio, images and video recipes-rt - Provides package and image recipes for using and testing the PREEMPT_RT kernel recipes-sato - The Sato demo/reference UI/UX, its associated apps and configuration diff --git a/poky/scripts/lib/checklayer/cases/common.py b/poky/scripts/lib/checklayer/cases/common.py index 8ffe028b3..b82304e36 100644 --- a/poky/scripts/lib/checklayer/cases/common.py +++ b/poky/scripts/lib/checklayer/cases/common.py @@ -12,7 +12,7 @@ from checklayer.case import OECheckLayerTestCase class CommonCheckLayer(OECheckLayerTestCase): def test_readme(self): # The top-level README file may have a suffix (like README.rst or README.txt). - readme_files = glob.glob(os.path.join(self.tc.layer['path'], 'README*')) + readme_files = glob.glob(os.path.join(self.tc.layer['path'], '[Rr][Ee][Aa][Dd][Mm][Ee]*')) self.assertTrue(len(readme_files) > 0, msg="Layer doesn't contains README file.") diff --git a/poky/scripts/lib/devtool/standard.py b/poky/scripts/lib/devtool/standard.py index 96af48879..9eeaefb79 100644 --- a/poky/scripts/lib/devtool/standard.py +++ b/poky/scripts/lib/devtool/standard.py @@ -482,9 +482,9 @@ def symlink_oelocal_files_srctree(rd,srctree): addfiles.append(os.path.join(relpth, fn)) if addfiles: bb.process.run('git add %s' % ' '.join(addfiles), cwd=srctree) - useroptions = [] - oe.patch.GitApplyTree.gitCommandUserOptions(useroptions, d=rd) - bb.process.run('git %s commit -a -m "Committing local file symlinks\n\n%s"' % (' '.join(useroptions), oe.patch.GitApplyTree.ignore_commit_prefix), cwd=srctree) + useroptions = [] + oe.patch.GitApplyTree.gitCommandUserOptions(useroptions, d=rd) + bb.process.run('git %s commit -m "Committing local file symlinks\n\n%s"' % (' '.join(useroptions), oe.patch.GitApplyTree.ignore_commit_prefix), cwd=srctree) def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, workspace, fixed_setup, d, tinfoil, no_overrides=False): diff --git a/poky/scripts/lib/resulttool/log.py b/poky/scripts/lib/resulttool/log.py index 25c339671..2352c767d 100644 --- a/poky/scripts/lib/resulttool/log.py +++ b/poky/scripts/lib/resulttool/log.py @@ -16,6 +16,16 @@ def show_ptest(result, ptest, logger): print("ptest '%s' not found" % ptest) return 1 +def show_reproducible(result, reproducible, logger): + try: + print(result['reproducible'][reproducible]['diffoscope.text']) + return 0 + + except KeyError: + print("reproducible '%s' not found" % reproducible) + return 1 + + def log(args, logger): results = resultutils.load_resultsdata(args.source) @@ -40,17 +50,28 @@ def log(args, logger): with open(dest, 'w') as f: f.write(ptest['log']) - if args.raw: + if args.raw_ptest: if 'ptestresult.rawlogs' in r: print(r['ptestresult.rawlogs']['log']) else: - print('Raw logs not found') + print('Raw ptest logs not found') + return 1 + + if args.raw_reproducible: + if 'reproducible.rawlogs' in r: + print(r['reproducible.rawlogs']['log']) + else: + print('Raw reproducible logs not found') return 1 for ptest in args.ptest: if not show_ptest(r, ptest, logger): return 1 + for reproducible in args.reproducible: + if not show_reproducible(r, reproducible, logger): + return 1 + def register_commands(subparsers): """Register subcommands from this plugin""" parser = subparsers.add_parser('log', help='show logs', @@ -63,9 +84,15 @@ def register_commands(subparsers): help='show logs for a ptest') parser.add_argument('--dump-ptest', metavar='DIR', help='Dump all ptest log files to the specified directory.') + parser.add_argument('--reproducible', action='append', default=[], + help='show logs for a reproducible test') parser.add_argument('--prepend-run', action='store_true', help='''Dump ptest results to a subdirectory named after the test run when using --dump-ptest. Required if more than one test run is present in the result file''') parser.add_argument('--raw', action='store_true', - help='show raw logs') + help='show raw (ptest) logs. Deprecated. Alias for "--raw-ptest"', dest='raw_ptest') + parser.add_argument('--raw-ptest', action='store_true', + help='show raw ptest log') + parser.add_argument('--raw-reproducible', action='store_true', + help='show raw reproducible build logs') diff --git a/poky/scripts/lib/resulttool/report.py b/poky/scripts/lib/resulttool/report.py index f706280aa..8b03717d2 100644 --- a/poky/scripts/lib/resulttool/report.py +++ b/poky/scripts/lib/resulttool/report.py @@ -19,9 +19,9 @@ class ResultsTextReport(object): self.ptests = {} self.ltptests = {} self.ltpposixtests = {} - self.result_types = {'passed': ['PASSED', 'passed'], - 'failed': ['FAILED', 'failed', 'ERROR', 'error', 'UNKNOWN'], - 'skipped': ['SKIPPED', 'skipped']} + self.result_types = {'passed': ['PASSED', 'passed', 'PASS', 'XFAIL'], + 'failed': ['FAILED', 'failed', 'FAIL', 'ERROR', 'error', 'UNKNOWN', 'XPASS'], + 'skipped': ['SKIPPED', 'skipped', 'UNSUPPORTED', 'UNTESTED', 'UNRESOLVED']} def handle_ptest_result(self, k, status, result, machine): diff --git a/poky/scripts/lib/scriptutils.py b/poky/scripts/lib/scriptutils.py index e7e7021c2..c573dc7f6 100644 --- a/poky/scripts/lib/scriptutils.py +++ b/poky/scripts/lib/scriptutils.py @@ -16,12 +16,51 @@ import string import subprocess import sys import tempfile +import threading import importlib from importlib import machinery -def logger_create(name, stream=None): +class KeepAliveStreamHandler(logging.StreamHandler): + def __init__(self, keepalive=True, **kwargs): + super().__init__(**kwargs) + if keepalive is True: + keepalive = 5000 # default timeout + self._timeout = threading.Condition() + self._stop = False + + # background thread waits on condition, if the condition does not + # happen emit a keep alive message + def thread(): + while not self._stop: + with self._timeout: + if not self._timeout.wait(keepalive): + self.emit(logging.LogRecord("keepalive", logging.INFO, + None, None, "Keepalive message", None, None)) + + self._thread = threading.Thread(target = thread, daemon = True) + self._thread.start() + + def close(self): + # mark the thread to stop and notify it + self._stop = True + with self._timeout: + self._timeout.notify() + # wait for it to join + self._thread.join() + super().close() + + def emit(self, record): + super().emit(record) + # trigger timer reset + with self._timeout: + self._timeout.notify() + +def logger_create(name, stream=None, keepalive=None): logger = logging.getLogger(name) - loggerhandler = logging.StreamHandler(stream=stream) + if keepalive is not None: + loggerhandler = KeepAliveStreamHandler(stream=stream, keepalive=keepalive) + else: + loggerhandler = logging.StreamHandler(stream=stream) loggerhandler.setFormatter(logging.Formatter("%(levelname)s: %(message)s")) logger.addHandler(loggerhandler) logger.setLevel(logging.INFO) diff --git a/poky/scripts/lib/wic/canned-wks/qemuriscv.wks b/poky/scripts/lib/wic/canned-wks/qemuriscv.wks new file mode 100644 index 000000000..12c68b706 --- /dev/null +++ b/poky/scripts/lib/wic/canned-wks/qemuriscv.wks @@ -0,0 +1,3 @@ +# short-description: Create qcow2 image for RISC-V QEMU machines + +part / --source rootfs --fstype=ext4 --label root --align 4096 --size 5G diff --git a/poky/scripts/oe-selftest b/poky/scripts/oe-selftest index 57662b2f7..18ac0f586 100755 --- a/poky/scripts/oe-selftest +++ b/poky/scripts/oe-selftest @@ -33,7 +33,7 @@ scriptpath.add_bitbake_lib_path() from oeqa.utils import load_test_components from oeqa.core.exception import OEQAPreRun -logger = scriptutils.logger_create('oe-selftest', stream=sys.stdout) +logger = scriptutils.logger_create('oe-selftest', stream=sys.stdout, keepalive=True) def main(): description = "Script that runs unit tests against bitbake and other Yocto related tools. The goal is to validate tools functionality and metadata integrity. Refer to https://wiki.yoctoproject.org/wiki/Oe-selftest for more information." diff --git a/poky/scripts/runqemu b/poky/scripts/runqemu index e9b83737c..4415e9b69 100755 --- a/poky/scripts/runqemu +++ b/poky/scripts/runqemu @@ -82,7 +82,7 @@ of the following environment variables (in any order): bootparams=<xyz> - specify custom kernel parameters during boot help, -h, --help: print this text -d, --debug: Enable debug output - -q, --quite: Hide most output except error messages + -q, --quiet: Hide most output except error messages Examples: runqemu @@ -145,8 +145,6 @@ class BaseConfig(object): # to be added with -drive if=pflash. # Found in the same places as the rootfs, with or without one of # these suffices: qcow2, bin. - # Setting one also adds "-vga std" because that is all that - # OVMF supports. self.ovmf_bios = [] # When enrolling default Secure Boot keys, the hypervisor # must provide the Platform Key and the first Key Exchange Key @@ -755,8 +753,8 @@ class BaseConfig(object): if s: self.set('QB_MEM', '-m %s' % s.group(1)) elif not self.get('QB_MEM'): - logger.info('QB_MEM is not set, use 512M by default') - self.set('QB_MEM', '-m 512') + logger.info('QB_MEM is not set, use 256M by default') + self.set('QB_MEM', '-m 256') # Check and remove M or m suffix qb_mem = self.get('QB_MEM') @@ -1283,10 +1281,6 @@ class BaseConfig(object): for ovmf in self.ovmf_bios: format = ovmf.rsplit('.', 1)[-1] self.qemu_opt += ' -drive if=pflash,format=%s,file=%s' % (format, ovmf) - if self.ovmf_bios: - # OVMF only supports normal VGA, i.e. we need to override a -vga vmware - # that gets added for example for normal qemux86. - self.qemu_opt += ' -vga std' self.qemu_opt += ' ' + self.qemu_opt_script |