From patchwork Mon Aug 6 22:56:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143531 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3806513ljj; Mon, 6 Aug 2018 15:57:55 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc1jce6WzatULUl/VWKWE1f5bafYNn0ORgLH/CqREs8UdMdBB8ZLPm0XFQsG2Xrao3mOzUw X-Received: by 2002:a62:34c4:: with SMTP id b187-v6mr18863345pfa.15.1533596275586; Mon, 06 Aug 2018 15:57:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596275; cv=none; d=google.com; s=arc-20160816; b=vL/gmTZW2z/F5VVuZ4YkLIGvRAkNbU3KN8cL9dzsJeK4KQJEcXeo/VPAFmieDqtlK7 spiPjr0u1P32WkMrznr44Zef15Q95Kcu2LcFiPL8/yaMLYfqVBZaYr8narfem3R+VKKg YleNiigv/XRhK3TO4Hi97NU7cZAwfJD6bv2MZEJED5ltRelBF8w+qaof+w6qjPoogq/C 3EzWWvecGb/9tGLpJG2D/r2UMUzcFwZ6bWtwRr8d7rmYiglTt7Z2EPUanlK88JRgH5FW 49Vm4U7Ax/OWDU/pyuRFv/C0JIncy9k4+5XS0l9t2AACSy2E6A3XQBHsA7bJjzmsOwUO ZijA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=jx0NnkVy4FxhCeL5LKej06C6c4robBDy0ketUbj5IVU=; b=ODrpKg9fB8I1s6GNTlaizK7K8RkyjVDWJdzJ26r5/sIkVMPtgw/1YLKHAFi/U1gbf1 AXVH1r7vvwvd3fujuC+UlvA5I6acz9SVB5+ID54rhpLS2kKroMhVlerDIhP6+YYZdYNB hitBYKRbD/XGtDYl8uHiOzlYxqSC5eZO9v8CLgQzc3Ddy2LCDgHG95YRN4cO5MiJyEYZ vE3zGZgI65Zrx1YkYaBr+P5ZJ4lbI0pdUvCWADr6UdlCqMlry3EU9Fh7Lu2HXbsh/Vnd ltLJ7WUPoWPwBdRE1bsVTnhF0+dOwf43N6n7rP9pgEytgG9pwo75hIol7t4tqLI748Cu 54LA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=BlzgjrK1; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id f12-v6si13262393pgm.601.2018.08.06.15.57.55; Mon, 06 Aug 2018 15:57:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=BlzgjrK1; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7633178BFC; Mon, 6 Aug 2018 22:57:44 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f43.google.com (mail-pl0-f43.google.com [209.85.160.43]) by mail.openembedded.org (Postfix) with ESMTP id AFC7378A40 for ; Mon, 6 Aug 2018 22:57:25 +0000 (UTC) Received: by mail-pl0-f43.google.com with SMTP id s17-v6so6240553plp.7 for ; Mon, 06 Aug 2018 15:57:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9gmmjuijuiOxymRmMbz3lxPcDBbtydkethbTGXG4IB8=; b=BlzgjrK1AKP9ZVGTdWtzUOpbSLKALFMihCzPXpkTV4DGBwTuKmshDDGJorOmYM+dZk EQLd1lfjoNwBNAM/Ms1HmKcEmcsuDRPVrps6dSxmD9wnz8iqRS/sDvhMRAecOpm9zYPc dOim9neGASa77Zd/S43RvoHieRpsQsWjNeJtNGe2kAvwily+eAY9E5KnrZB449IAsUn5 8giXHQM3C3VoVku4MiyQlw8s6hyefG6CYlAhEgwd+N28k7v5OuvHcUcPrJhT37m2MFey pCIcaaYhKJqVfGxetXjFEWIaRBJEpcnlL7N7y43xIX4n8lydts8ZN7prASNn4SqApjtm ttRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9gmmjuijuiOxymRmMbz3lxPcDBbtydkethbTGXG4IB8=; b=TeJMNzvZI2bZTtMSHOwhbNrYbbN9FNQ0Qt/1dKHtqY9NH0F0j+ZNTCeF5y0pWdIrv3 CZcxXdGFFNJ0U8a/BsGLVfO9LN02xgcaMFJOlHi+ElJtjad6rFx0G+B+tw1NGEX+s3mg bN+8UQuBEHa8FDNlZv4iAsTVXcXyZ/vGWHU99VEw+MOIwsl10cVIQjynAbx6AyPvz+YP IIpKGkiqPzdcmXy4ouU0BFfC+IFrhAIqWQlcXCEeLovKwpcNYjLRU2e8gOfe+4qqQEzr GPQbGKiEYc0/651UzdWunUJTmOYSPgfZenZ1cDfAgzSOJ6bCiSBTsN1CjdNmdbrM3RLy LJOQ== X-Gm-Message-State: AOUpUlFCiAw9aQY2f92dMGXF873eqp6B4ZaQ4/c7vvMzRtF7GfjFkTGQ wArbTW2qPGdoV0DjO2ht3e4S2aXl X-Received: by 2002:a17:902:8303:: with SMTP id bd3-v6mr15633020plb.329.1533596244518; Mon, 06 Aug 2018 15:57:24 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:23 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:56:58 -0700 Message-Id: <940749a27b80a1bd06f29e45b8d80bc726ae0cd6.1533595822.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [OE-core] [PATCH 01/18] glibc: Upgrade to 2.28 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org License-Update: libidn is dropped from glibc and a testcase that was a particular contributor copyrighted see https://sourceware.org/git/?p=glibc.git;a=blobdiff;f=LICENSES;h=0e3a9fe39b26e97038d92f904508a4c3aa1bb43b;hp=b29efe01084af28cc40953d7317f22927c0ee3b7;hb=5a357506659f9a00fcf5bc9c5d8fc676175c89a7;hpb=7279af007c420a9d5f88a6909d11e7cb712c16a4 https://sourceware.org/git/?p=glibc.git;a=blobdiff;f=LICENSES;h=b29efe01084af28cc40953d7317f22927c0ee3b7;hp=80f7f1487947f57815b9fe076fadc8c7f94eeb8e;hb=7f9f1ecb710eac4d65bb02785ddf288cac098323;hpb=5f7b841d3aebdccc2baed27cb4b22ddb08cd7c0c Drop upstreamed and backported patches Signed-off-by: Khem Raj --- meta/conf/distro/include/tcmode-default.inc | 2 +- ...2.27.bb => cross-localedef-native_2.28.bb} | 18 +- ...-initial_2.27.bb => glibc-initial_2.28.bb} | 0 ...bc-locale_2.27.bb => glibc-locale_2.28.bb} | 0 ...bc-mtrace_2.27.bb => glibc-mtrace_2.28.bb} | 0 ...-scripts_2.27.bb => glibc-scripts_2.28.bb} | 0 ...Look-for-host-system-ld.so.cache-as-.patch | 12 +- ...Fix-buffer-overrun-with-a-relocated-.patch | 10 +- ...Raise-the-size-of-arrays-containing-.patch | 18 +- ...k-glibc-Allow-64-bit-atomics-for-x86.patch | 6 +- ...ake-relocatable-install-for-locales.patch} | 45 +- ...500-e6500-603e-fsqrt-implementation.patch} | 44 +- ...E_KNOWN_INTERPRETER_NAMES-to-known-.patch} | 6 +- ...ndefined-reference-to-__sqrt_finite.patch} | 6 +- ...are-now-inline-functions-and-call-o.patch} | 6 +- ...43-which-explains-what-the-patch-do.patch} | 8 +- ...-err-tab.pl-with-specific-dirs-in-S.patch} | 6 +- ...are-now-inline-functions-and-call-o.patch} | 6 +- ...gure.ac-handle-correctly-libc_cv_ro.patch} | 6 +- ....patch => 0014-Add-unused-attribute.patch} | 6 +- ...he-path-sets-wrong-config-variables.patch} | 6 +- ...one-re-written-tzselect-as-posix-sh.patch} | 6 +- ...ash-dependency-for-nscd-init-script.patch} | 6 +- ...s-building-and-testing-instructions.patch} | 10 +- ...libc-Help-bootstrap-cross-toolchain.patch} | 12 +- ...-eglibc-Clear-cache-lines-on-ppc8xx.patch} | 6 +- ...glibc-Resolve-__fpscr_values-on-SH4.patch} | 6 +- ...port-cross-locale-generation-support.patch | 28 +- ...Define-DUMMY_LOCALE_T-if-not-defined.patch | 6 +- ...ke-_dl_build_local_scope-breadth-fir.patch | 10 +- ...le-fix-hard-coded-reference-to-gcc-E.patch | 6 +- ...set-dl_load_write_lock-after-forking.patch | 14 +- ...ck-before-switching-to-malloc_atfork.patch | 30 +- ...sts.h-enum-definition-for-TRAP_HWBKP.patch | 14 +- ...with-memccpy-to-fix-Wstringop-trunca.patch | 40 -- ...archive-uses-a-hard-coded-locale-pa.patch} | 23 +- ...t-no-lines-in-bison-generated-files.patch} | 17 +- .../0031-nativesdk-deprecate-libcrypt.patch | 419 ------------------ .../glibc/glibc/CVE-2017-18269.patch | 178 -------- .../glibc/glibc/CVE-2018-11236.patch | 164 ------- .../glibc/glibc/CVE-2018-11237.patch | 82 ---- .../glibc/{glibc_2.27.bb => glibc_2.28.bb} | 46 +- 42 files changed, 244 insertions(+), 1090 deletions(-) rename meta/recipes-core/glibc/{cross-localedef-native_2.27.bb => cross-localedef-native_2.28.bb} (70%) rename meta/recipes-core/glibc/{glibc-initial_2.27.bb => glibc-initial_2.28.bb} (100%) rename meta/recipes-core/glibc/{glibc-locale_2.27.bb => glibc-locale_2.28.bb} (100%) rename meta/recipes-core/glibc/{glibc-mtrace_2.27.bb => glibc-mtrace_2.28.bb} (100%) rename meta/recipes-core/glibc/{glibc-scripts_2.27.bb => glibc-scripts_2.28.bb} (100%) rename meta/recipes-core/glibc/glibc/{relocate-locales.patch => 0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch} (80%) rename meta/recipes-core/glibc/glibc/{0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch => 0006-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch} (97%) rename meta/recipes-core/glibc/glibc/{0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch => 0007-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch} (85%) rename meta/recipes-core/glibc/glibc/{0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch => 0008-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch} (98%) rename meta/recipes-core/glibc/glibc/{0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch => 0009-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch} (98%) rename meta/recipes-core/glibc/glibc/{0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch => 0010-Quote-from-bug-1443-which-explains-what-the-patch-do.patch} (93%) rename meta/recipes-core/glibc/glibc/{0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch => 0011-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch} (89%) rename meta/recipes-core/glibc/glibc/{0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch => 0012-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch} (93%) rename meta/recipes-core/glibc/glibc/{0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch => 0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch} (88%) rename meta/recipes-core/glibc/glibc/{0013-Add-unused-attribute.patch => 0014-Add-unused-attribute.patch} (86%) rename meta/recipes-core/glibc/glibc/{0014-yes-within-the-path-sets-wrong-config-variables.patch => 0015-yes-within-the-path-sets-wrong-config-variables.patch} (98%) rename meta/recipes-core/glibc/glibc/{0015-timezone-re-written-tzselect-as-posix-sh.patch => 0016-timezone-re-written-tzselect-as-posix-sh.patch} (90%) rename meta/recipes-core/glibc/glibc/{0016-Remove-bash-dependency-for-nscd-init-script.patch => 0017-Remove-bash-dependency-for-nscd-init-script.patch} (92%) rename meta/recipes-core/glibc/glibc/{0017-eglibc-Cross-building-and-testing-instructions.patch => 0018-eglibc-Cross-building-and-testing-instructions.patch} (99%) rename meta/recipes-core/glibc/glibc/{0018-eglibc-Help-bootstrap-cross-toolchain.patch => 0019-eglibc-Help-bootstrap-cross-toolchain.patch} (91%) rename meta/recipes-core/glibc/glibc/{0019-eglibc-Clear-cache-lines-on-ppc8xx.patch => 0020-eglibc-Clear-cache-lines-on-ppc8xx.patch} (96%) rename meta/recipes-core/glibc/glibc/{0020-eglibc-Resolve-__fpscr_values-on-SH4.patch => 0021-eglibc-Resolve-__fpscr_values-on-SH4.patch} (92%) delete mode 100644 meta/recipes-core/glibc/glibc/0029-Replace-strncpy-with-memccpy-to-fix-Wstringop-trunca.patch rename meta/recipes-core/glibc/glibc/{archive-path.patch => 0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch} (69%) rename meta/recipes-core/glibc/glibc/{0030-plural_c_no_preprocessor_lines.patch => 0030-intl-Emit-no-lines-in-bison-generated-files.patch} (59%) delete mode 100644 meta/recipes-core/glibc/glibc/0031-nativesdk-deprecate-libcrypt.patch delete mode 100644 meta/recipes-core/glibc/glibc/CVE-2017-18269.patch delete mode 100644 meta/recipes-core/glibc/glibc/CVE-2018-11236.patch delete mode 100644 meta/recipes-core/glibc/glibc/CVE-2018-11237.patch rename meta/recipes-core/glibc/{glibc_2.27.bb => glibc_2.28.bb} (72%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 24a21b5837..bed1594b7a 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -26,7 +26,7 @@ GCCVERSION ?= "8.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.31%" GDBVERSION ?= "8.1%" -GLIBCVERSION ?= "2.27%" +GLIBCVERSION ?= "2.28%" LINUXLIBCVERSION ?= "4.15%" QEMUVERSION ?= "2.12%" diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.27.bb b/meta/recipes-core/glibc/cross-localedef-native_2.28.bb similarity index 70% rename from meta/recipes-core/glibc/cross-localedef-native_2.27.bb rename to meta/recipes-core/glibc/cross-localedef-native_2.28.bb index 6a26376ac2..0992e0285d 100644 --- a/meta/recipes-core/glibc/cross-localedef-native_2.27.bb +++ b/meta/recipes-core/glibc/cross-localedef-native_2.28.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" SECTION = "libs" LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \ +LIC_FILES_CHKSUM = "file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" @@ -21,20 +21,20 @@ SRCBRANCH ?= "release/${PV}/master" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+(\.(?!90)\d+)*)" -SRCREV_glibc ?= "df3ff4e49d4ee3cbbdaeb0b1cb5dc2344c08be98" +SRCREV_glibc ?= "3c03baca37fdcb52c3881e653ca392bba7a99c2b" SRCREV_localedef ?= "de5bdbd5e76b5403a4151b9b9f958b6cca36b3e7" SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \ - file://0015-timezone-re-written-tzselect-as-posix-sh.patch \ - file://0016-Remove-bash-dependency-for-nscd-init-script.patch \ - file://0017-eglibc-Cross-building-and-testing-instructions.patch \ - file://0018-eglibc-Help-bootstrap-cross-toolchain.patch \ - file://0019-eglibc-Clear-cache-lines-on-ppc8xx.patch \ - file://0020-eglibc-Resolve-__fpscr_values-on-SH4.patch \ + file://0016-timezone-re-written-tzselect-as-posix-sh.patch \ + file://0017-Remove-bash-dependency-for-nscd-init-script.patch \ + file://0018-eglibc-Cross-building-and-testing-instructions.patch \ + file://0019-eglibc-Help-bootstrap-cross-toolchain.patch \ + file://0020-eglibc-Clear-cache-lines-on-ppc8xx.patch \ + file://0021-eglibc-Resolve-__fpscr_values-on-SH4.patch \ file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \ file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \ - file://archive-path.patch \ + file://0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \ " # Makes for a rather long rev (22 characters), but... # diff --git a/meta/recipes-core/glibc/glibc-initial_2.27.bb b/meta/recipes-core/glibc/glibc-initial_2.28.bb similarity index 100% rename from meta/recipes-core/glibc/glibc-initial_2.27.bb rename to meta/recipes-core/glibc/glibc-initial_2.28.bb diff --git a/meta/recipes-core/glibc/glibc-locale_2.27.bb b/meta/recipes-core/glibc/glibc-locale_2.28.bb similarity index 100% rename from meta/recipes-core/glibc/glibc-locale_2.27.bb rename to meta/recipes-core/glibc/glibc-locale_2.28.bb diff --git a/meta/recipes-core/glibc/glibc-mtrace_2.27.bb b/meta/recipes-core/glibc/glibc-mtrace_2.28.bb similarity index 100% rename from meta/recipes-core/glibc/glibc-mtrace_2.27.bb rename to meta/recipes-core/glibc/glibc-mtrace_2.28.bb diff --git a/meta/recipes-core/glibc/glibc-scripts_2.27.bb b/meta/recipes-core/glibc/glibc-scripts_2.28.bb similarity index 100% rename from meta/recipes-core/glibc/glibc-scripts_2.27.bb rename to meta/recipes-core/glibc/glibc-scripts_2.28.bb diff --git a/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch b/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch index 86234c9d2e..14089350d9 100644 --- a/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch +++ b/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch @@ -1,7 +1,7 @@ -From bd91b60ce6ff01f49b173b6b45e23ce94911b2a6 Mon Sep 17 00:00:00 2001 +From 70fd60e2a8f40a160736cb9b268dfa6508aa55a7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 01:48:24 +0000 -Subject: [PATCH 01/27] nativesdk-glibc: Look for host system ld.so.cache as +Subject: [PATCH 01/30] nativesdk-glibc: Look for host system ld.so.cache as well Upstream-Status: Inappropriate [embedded specific] @@ -31,10 +31,10 @@ Signed-off-by: Khem Raj 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/elf/dl-load.c b/elf/dl-load.c -index 7554a99b5a..a73d11a62f 100644 +index c51e4b3718..44bbb69dc4 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c -@@ -2007,6 +2007,14 @@ _dl_map_object (struct link_map *loader, const char *name, +@@ -2085,6 +2085,14 @@ _dl_map_object (struct link_map *loader, const char *name, } } @@ -49,7 +49,7 @@ index 7554a99b5a..a73d11a62f 100644 #ifdef USE_LDCONFIG if (fd == -1 && (__glibc_likely ((mode & __RTLD_SECURE) == 0) -@@ -2065,14 +2073,6 @@ _dl_map_object (struct link_map *loader, const char *name, +@@ -2143,14 +2151,6 @@ _dl_map_object (struct link_map *loader, const char *name, } #endif @@ -65,5 +65,5 @@ index 7554a99b5a..a73d11a62f 100644 if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) _dl_debug_printf ("\n"); -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch b/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch index 899481f057..382915e840 100644 --- a/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch +++ b/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch @@ -1,7 +1,7 @@ -From 50736f7fc1fdc9e1f7c05f1fec75c977d9be9228 Mon Sep 17 00:00:00 2001 +From f0dd22dfdbf822afc674724c35cc462cfafbc186 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 01:50:00 +0000 -Subject: [PATCH 02/27] nativesdk-glibc: Fix buffer overrun with a relocated +Subject: [PATCH 02/30] nativesdk-glibc: Fix buffer overrun with a relocated SDK When ld-linux-*.so.2 is relocated to a path that is longer than the @@ -22,10 +22,10 @@ Signed-off-by: Khem Raj 1 file changed, 12 insertions(+) diff --git a/elf/dl-load.c b/elf/dl-load.c -index a73d11a62f..62e3eee478 100644 +index 44bbb69dc4..74e2e5e962 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c -@@ -1707,7 +1707,19 @@ open_path (const char *name, size_t namelen, int mode, +@@ -1785,7 +1785,19 @@ open_path (const char *name, size_t namelen, int mode, given on the command line when rtld is run directly. */ return -1; @@ -46,5 +46,5 @@ index a73d11a62f..62e3eee478 100644 { struct r_search_path_elem *this_dir = *dirs; -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch b/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch index 03f99916fa..f83e8192e2 100644 --- a/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch +++ b/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch @@ -1,7 +1,7 @@ -From 695e1cbff6ee6db3435c33e55311c67adf44476d Mon Sep 17 00:00:00 2001 +From 5962ca897efe965745e193c12041693c9e07dd24 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 01:51:38 +0000 -Subject: [PATCH 03/27] nativesdk-glibc: Raise the size of arrays containing dl +Subject: [PATCH 03/30] nativesdk-glibc: Raise the size of arrays containing dl paths This patch puts the dynamic loader path in the binaries, SYSTEM_DIRS strings @@ -41,10 +41,10 @@ index 6ee5153ff9..37a5f701fa 100644 _dl_cache_libcmp (const char *p1, const char *p2) { diff --git a/elf/dl-load.c b/elf/dl-load.c -index 62e3eee478..6ddba73650 100644 +index 74e2e5e962..8f19186e1c 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c -@@ -109,8 +109,8 @@ static size_t max_capstrlen attribute_relro; +@@ -110,8 +110,8 @@ static size_t max_capstrlen attribute_relro; gen-trusted-dirs.awk. */ #include "trusted-dirs.h" @@ -81,10 +81,10 @@ index fbdd814edf..9f4d8d69b1 100644 a platform. */ static int diff --git a/elf/rtld.c b/elf/rtld.c -index 453f56eb15..08e0c4c94b 100644 +index 1b0c74739f..a70a62d31e 100644 --- a/elf/rtld.c +++ b/elf/rtld.c -@@ -128,6 +128,7 @@ dso_name_valid_for_suid (const char *p) +@@ -130,6 +130,7 @@ dso_name_valid_for_suid (const char *p) } return *p != '\0'; } @@ -92,7 +92,7 @@ index 453f56eb15..08e0c4c94b 100644 /* LD_AUDIT variable contents. Must be processed before the audit_list below. */ -@@ -1000,12 +1001,12 @@ of this helper program; chances are you did not intend to run this program.\n\ +@@ -1001,12 +1002,12 @@ of this helper program; chances are you did not intend to run this program.\n\ --list list all dependencies and how they are resolved\n\ --verify verify that given object really is a dynamically linked\n\ object we can handle\n\ @@ -108,7 +108,7 @@ index 453f56eb15..08e0c4c94b 100644 ++_dl_skip_args; --_dl_argc; diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c -index d6cf9d2a3e..9fcf970144 100644 +index f173cde71b..5c3205026f 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -36,7 +36,7 @@ @@ -136,5 +136,5 @@ index cf43f1cf3b..7f07adde53 100644 # define add_system_dir(dir) add_dir (dir) #endif -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch b/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch index f9d70c2a09..a0957e6a7b 100644 --- a/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch +++ b/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch @@ -1,7 +1,7 @@ -From 2bafdbd7067794c6a24e5e85608c0ec4638c5667 Mon Sep 17 00:00:00 2001 +From ee17ca0a6b122466c484301ea9fe029dc7e5498f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 31 Dec 2015 14:35:35 -0800 -Subject: [PATCH 04/27] nativesdk-glibc: Allow 64 bit atomics for x86 +Subject: [PATCH 04/30] nativesdk-glibc: Allow 64 bit atomics for x86 The fix consist of allowing 64bit atomic ops for x86. This should be safe for i586 and newer CPUs. @@ -30,5 +30,5 @@ index 272da5dd8f..409c759f14 100644 #define ATOMIC_EXCHANGE_USES_CAS 0 -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/relocate-locales.patch b/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch similarity index 80% rename from meta/recipes-core/glibc/glibc/relocate-locales.patch rename to meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch index 2aea37f5ca..56ff398753 100644 --- a/meta/recipes-core/glibc/glibc/relocate-locales.patch +++ b/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch @@ -1,12 +1,24 @@ +From 7195d203c6986ccdb39053933b703391ccc6854a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 3 Aug 2018 09:55:12 -0700 +Subject: [PATCH 05/30] nativesdk-glibc: Make relocatable install for locales + The glibc locale path is hard-coded to the install prefix, but in SDKs we need to be able to relocate the binaries. Expand the strings to 4K and put them in a magic segment that we can relocate at install time. Upstream-Status: Inappropriate (OE-specific) + Signed-off-by: Ross Burton +Signed-off-by: Khem Raj +--- + locale/findlocale.c | 4 ++-- + locale/loadarchive.c | 2 +- + locale/localeinfo.h | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/findlocale.c b/locale/findlocale.c -index 872cadb5..da14fa39 100644 +index 872cadb5b9..dd651e07f5 100644 --- a/locale/findlocale.c +++ b/locale/findlocale.c @@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attribute_hidden = @@ -27,8 +39,21 @@ index 872cadb5..da14fa39 100644 } else /* We really have to load some data. First see whether the name is +diff --git a/locale/loadarchive.c b/locale/loadarchive.c +index 516d30d8d1..9bfbe1a5dd 100644 +--- a/locale/loadarchive.c ++++ b/locale/loadarchive.c +@@ -42,7 +42,7 @@ + + + /* Name of the locale archive file. */ +-static const char archfname[] = COMPLOCALEDIR "/locale-archive"; ++static const char archfname[4096] __attribute__ ((section (".gccrelocprefix"))) = COMPLOCALEDIR "/locale-archive"; + + /* Size of initial mapping window, optimal if large enough to + cover the header plus the initial locale. */ diff --git a/locale/localeinfo.h b/locale/localeinfo.h -index 68822a63..537bc351 100644 +index 68822a6319..537bc35149 100644 --- a/locale/localeinfo.h +++ b/locale/localeinfo.h @@ -325,7 +325,7 @@ _nl_lookup_word (locale_t l, int category, int item) @@ -40,16 +65,6 @@ index 68822a63..537bc351 100644 /* Load the locale data for CATEGORY from the file specified by *NAME. If *NAME is "", use environment variables as specified by POSIX, and -diff --git a/locale/loadarchive.c b/locale/loadarchive.c -index 516d30d8..792b37fb 100644 ---- a/locale/loadarchive.c -+++ b/locale/loadarchive.c -@@ -42,7 +43,7 @@ - - - /* Name of the locale archive file. */ --static const char archfname[] = COMPLOCALEDIR "/locale-archive"; -+static const char archfname[4096] __attribute__ ((section (".gccrelocprefix"))) = COMPLOCALEDIR "/locale-archive"; - - /* Size of initial mapping window, optimal if large enough to - cover the header plus the initial locale. */ +-- +2.18.0 + diff --git a/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch b/meta/recipes-core/glibc/glibc/0006-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch similarity index 97% rename from meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch rename to meta/recipes-core/glibc/glibc/0006-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch index ad9106eefa..1e712d5eba 100644 --- a/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch +++ b/meta/recipes-core/glibc/glibc/0006-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch @@ -1,31 +1,31 @@ -From 661adfe9c220d10617bf6bb283827471c3956b01 Mon Sep 17 00:00:00 2001 +From b28e06d87a43e6aacff5624aaec75106599edec8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 00:01:50 +0000 -Subject: [PATCH 05/27] fsl e500/e5500/e6500/603e fsqrt implementation +Subject: [PATCH 06/30] fsl e500/e5500/e6500/603e fsqrt implementation Upstream-Status: Pending Signed-off-by: Edmar Wienskoski Signed-off-by: Khem Raj --- - sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c | 134 +++++++++++++++++++++ - sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c | 101 ++++++++++++++++ - sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c | 134 +++++++++++++++++++++ - sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c | 101 ++++++++++++++++ - sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c | 134 +++++++++++++++++++++ - sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c | 101 ++++++++++++++++ - sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c | 134 +++++++++++++++++++++ - sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c | 101 ++++++++++++++++ - sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c | 134 +++++++++++++++++++++ - sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c | 101 ++++++++++++++++ - sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c | 134 +++++++++++++++++++++ - sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c | 101 ++++++++++++++++ - .../sysv/linux/powerpc/powerpc32/603e/fpu/Implies | 1 + - .../linux/powerpc/powerpc32/e300c3/fpu/Implies | 2 + - .../linux/powerpc/powerpc32/e500mc/fpu/Implies | 1 + - .../sysv/linux/powerpc/powerpc32/e5500/fpu/Implies | 1 + - .../sysv/linux/powerpc/powerpc32/e6500/fpu/Implies | 1 + - .../sysv/linux/powerpc/powerpc64/e5500/fpu/Implies | 1 + - .../sysv/linux/powerpc/powerpc64/e6500/fpu/Implies | 1 + + sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c | 134 ++++++++++++++++++ + sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c | 101 +++++++++++++ + sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c | 134 ++++++++++++++++++ + .../powerpc/powerpc32/e500mc/fpu/e_sqrtf.c | 101 +++++++++++++ + sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c | 134 ++++++++++++++++++ + sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c | 101 +++++++++++++ + sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c | 134 ++++++++++++++++++ + sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c | 101 +++++++++++++ + sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c | 134 ++++++++++++++++++ + sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c | 101 +++++++++++++ + sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c | 134 ++++++++++++++++++ + sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c | 101 +++++++++++++ + .../linux/powerpc/powerpc32/603e/fpu/Implies | 1 + + .../powerpc/powerpc32/e300c3/fpu/Implies | 2 + + .../powerpc/powerpc32/e500mc/fpu/Implies | 1 + + .../linux/powerpc/powerpc32/e5500/fpu/Implies | 1 + + .../linux/powerpc/powerpc32/e6500/fpu/Implies | 1 + + .../linux/powerpc/powerpc64/e5500/fpu/Implies | 1 + + .../linux/powerpc/powerpc64/e6500/fpu/Implies | 1 + 19 files changed, 1418 insertions(+) create mode 100644 sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c create mode 100644 sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c @@ -1580,5 +1580,5 @@ index 0000000000..04ff8cc181 @@ -0,0 +1 @@ +powerpc/powerpc64/e6500/fpu -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch b/meta/recipes-core/glibc/glibc/0007-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch similarity index 85% rename from meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch rename to meta/recipes-core/glibc/glibc/0007-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch index a3d50fd054..251e9dd4b1 100644 --- a/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch +++ b/meta/recipes-core/glibc/glibc/0007-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch @@ -1,7 +1,7 @@ -From 615598fcca64461a71d84f756d75374f02d914ad Mon Sep 17 00:00:00 2001 +From fd2bd3037ef49f67f12659b6aaba02f76e131a24 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 00:11:22 +0000 -Subject: [PATCH 06/27] readlib: Add OECORE_KNOWN_INTERPRETER_NAMES to known +Subject: [PATCH 07/30] readlib: Add OECORE_KNOWN_INTERPRETER_NAMES to known names This bolts in a hook for OE to pass its own version of interpreter @@ -29,5 +29,5 @@ index 573c01476c..d8c7412287 100644 static struct known_names known_libs[] = -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch b/meta/recipes-core/glibc/glibc/0008-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch similarity index 98% rename from meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch rename to meta/recipes-core/glibc/glibc/0008-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch index 1234df0a09..67439c4b87 100644 --- a/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch +++ b/meta/recipes-core/glibc/glibc/0008-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch @@ -1,7 +1,7 @@ -From 804b73ae295bdfda29341e89f2d0c1b99492dc9a Mon Sep 17 00:00:00 2001 +From b696fe0c6147afc375ae573063a92a53857248eb Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 00:15:07 +0000 -Subject: [PATCH 07/27] ppc/sqrt: Fix undefined reference to `__sqrt_finite' +Subject: [PATCH 08/30] ppc/sqrt: Fix undefined reference to `__sqrt_finite' on ppc fixes the errors like below | ./.libs/libpulsecore-1.1.so: undefined reference to `__sqrt_finite' @@ -204,5 +204,5 @@ index 26fa067abf..9d175122a8 100644 } +strong_alias (__ieee754_sqrtf, __sqrtf_finite) -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/meta/recipes-core/glibc/glibc/0009-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch similarity index 98% rename from meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch rename to meta/recipes-core/glibc/glibc/0009-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch index 1b43647514..1d27a56c79 100644 --- a/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch +++ b/meta/recipes-core/glibc/glibc/0009-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch @@ -1,7 +1,7 @@ -From 1a53084249d9dae1ef4281246efc899c8f9d63ed Mon Sep 17 00:00:00 2001 +From 324aa1ffbf85ebd06b54f228604d6651895c1eea Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 00:16:38 +0000 -Subject: [PATCH 08/27] __ieee754_sqrt{,f} are now inline functions and call +Subject: [PATCH 09/30] __ieee754_sqrt{,f} are now inline functions and call out __slow versions Upstream-Status: Pending @@ -383,5 +383,5 @@ index 9d175122a8..10de1f0cc3 100644 + strong_alias (__ieee754_sqrtf, __sqrtf_finite) -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch b/meta/recipes-core/glibc/glibc/0010-Quote-from-bug-1443-which-explains-what-the-patch-do.patch similarity index 93% rename from meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch rename to meta/recipes-core/glibc/glibc/0010-Quote-from-bug-1443-which-explains-what-the-patch-do.patch index ea498569b3..6b2bf65cac 100644 --- a/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch +++ b/meta/recipes-core/glibc/glibc/0010-Quote-from-bug-1443-which-explains-what-the-patch-do.patch @@ -1,7 +1,7 @@ -From 48262b6dda935278a40374ddf0080ab6cc999582 Mon Sep 17 00:00:00 2001 +From f6581da98bef982c888061fa06092c03f3c6c708 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 00:20:09 +0000 -Subject: [PATCH 09/27] Quote from bug 1443 which explains what the patch does +Subject: [PATCH 10/30] Quote from bug 1443 which explains what the patch does : We build some random program and link it with -lust. When we run it, @@ -45,7 +45,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h -index 8a00eab5e3..623edcb1bd 100644 +index 1a4fd3f17b..a02c47571a 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -510,7 +510,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, @@ -58,5 +58,5 @@ index 8a00eab5e3..623edcb1bd 100644 case R_ARM_TLS_TPOFF32: -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch b/meta/recipes-core/glibc/glibc/0011-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch similarity index 89% rename from meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch rename to meta/recipes-core/glibc/glibc/0011-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch index 17513185da..dfe2fe4b83 100644 --- a/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch +++ b/meta/recipes-core/glibc/glibc/0011-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch @@ -1,7 +1,7 @@ -From 72ea5410909aef6b6aee70e7f9a88d534583aa00 Mon Sep 17 00:00:00 2001 +From 635d4a48c331b5ccc9165a6f622091845a5245b0 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Wed, 19 Dec 2012 04:39:57 -0600 -Subject: [PATCH 10/27] eglibc: run libm-err-tab.pl with specific dirs in ${S} +Subject: [PATCH 11/30] eglibc: run libm-err-tab.pl with specific dirs in ${S} libm-err-tab.pl will parse all the files named "libm-test-ulps" in the given dir recursively. To avoid parsing the one in @@ -32,5 +32,5 @@ index c2756640a7..1b5bb16a96 100644 touch $@ -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/meta/recipes-core/glibc/glibc/0012-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch similarity index 93% rename from meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch rename to meta/recipes-core/glibc/glibc/0012-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch index 1e70b2a30e..3fcaedd8ef 100644 --- a/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch +++ b/meta/recipes-core/glibc/glibc/0012-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch @@ -1,7 +1,7 @@ -From 8ae998a10b24545e0c12f1f3d8be97b191178204 Mon Sep 17 00:00:00 2001 +From 11991e14957063b0e5fa366d836f42dd6d3e10cd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 00:24:46 +0000 -Subject: [PATCH 11/27] __ieee754_sqrt{,f} are now inline functions and call +Subject: [PATCH 12/30] __ieee754_sqrt{,f} are now inline functions and call out __slow versions Upstream-Status: Pending @@ -57,5 +57,5 @@ index 812653558f..10de1f0cc3 100644 #endif { -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch b/meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch similarity index 88% rename from meta/recipes-core/glibc/glibc/0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch rename to meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch index c35b759a28..32796354a0 100644 --- a/meta/recipes-core/glibc/glibc/0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch +++ b/meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch @@ -1,7 +1,7 @@ -From 4f9f39761909e67bd6d29b970b7165863e33e565 Mon Sep 17 00:00:00 2001 +From 36b0c04436f6ec7dc270d387cb036b5361544618 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 00:27:10 +0000 -Subject: [PATCH 12/27] sysdeps/gnu/configure.ac: handle correctly +Subject: [PATCH 13/30] sysdeps/gnu/configure.ac: handle correctly $libc_cv_rootsbindir Upstream-Status:Pending @@ -38,5 +38,5 @@ index 634fe4de2a..3db1697f4f 100644 ;; esac -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0013-Add-unused-attribute.patch b/meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch similarity index 86% rename from meta/recipes-core/glibc/glibc/0013-Add-unused-attribute.patch rename to meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch index 62c65253dd..cfc044506b 100644 --- a/meta/recipes-core/glibc/glibc/0013-Add-unused-attribute.patch +++ b/meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch @@ -1,7 +1,7 @@ -From bba7a647b636618d5fd083e904f995f7736b9168 Mon Sep 17 00:00:00 2001 +From f1969e4c95e810280edf5e11c8a6f32b3a56e2fb Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 00:28:41 +0000 -Subject: [PATCH 13/27] Add unused attribute +Subject: [PATCH 14/30] Add unused attribute Helps in avoiding gcc warning when header is is included in a source file which does not use both functions @@ -30,5 +30,5 @@ index 123e2a62ce..63cc83ec84 100644 { int slash_count = 0; -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0014-yes-within-the-path-sets-wrong-config-variables.patch b/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch similarity index 98% rename from meta/recipes-core/glibc/glibc/0014-yes-within-the-path-sets-wrong-config-variables.patch rename to meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch index 66911285a9..217a3f6088 100644 --- a/meta/recipes-core/glibc/glibc/0014-yes-within-the-path-sets-wrong-config-variables.patch +++ b/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch @@ -1,7 +1,7 @@ -From 62f44ce3dd01a257cf67116e355492cb1659a917 Mon Sep 17 00:00:00 2001 +From be9965d0e53db1d7fe9419710a84c75526a18cc0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 00:31:06 +0000 -Subject: [PATCH 14/27] 'yes' within the path sets wrong config variables +Subject: [PATCH 15/30] 'yes' within the path sets wrong config variables It seems that the 'AC_EGREP_CPP(yes...' example is quite popular but being such a short word to grep it is likely to produce @@ -259,5 +259,5 @@ index f9cba6e15d..b21f72f1e4 100644 ], libc_cv_ppc64_def_call_elf=yes, libc_cv_ppc64_def_call_elf=no)]) if test $libc_cv_ppc64_def_call_elf = no; then -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch b/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch similarity index 90% rename from meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch rename to meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch index 66bf4fdabd..719193cbf9 100644 --- a/meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch +++ b/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch @@ -1,7 +1,7 @@ -From ac240fb01f6470ac207968adfbe20ccc93b16f8b Mon Sep 17 00:00:00 2001 +From 60694f7ed69c8b711ffe37ce157032e85f60347b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 00:33:03 +0000 -Subject: [PATCH 15/27] timezone: re-written tzselect as posix sh +Subject: [PATCH 16/30] timezone: re-written tzselect as posix sh To avoid the bash dependency. @@ -41,5 +41,5 @@ index d2c3a6d1dd..089679f306 100755 # Output one argument as-is to standard output. # Safer than 'echo', which can mishandle '\' or leading '-'. -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0016-Remove-bash-dependency-for-nscd-init-script.patch b/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch similarity index 92% rename from meta/recipes-core/glibc/glibc/0016-Remove-bash-dependency-for-nscd-init-script.patch rename to meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch index 0b1ee96871..e1a0d4918a 100644 --- a/meta/recipes-core/glibc/glibc/0016-Remove-bash-dependency-for-nscd-init-script.patch +++ b/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch @@ -1,7 +1,7 @@ -From 790b133ff2bc5b77ed8533b8999abc65ed0da02b Mon Sep 17 00:00:00 2001 +From 0d6e36d38569ec716331c48a2187b391f5680363 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 31 Dec 2015 14:33:02 -0800 -Subject: [PATCH 16/27] Remove bash dependency for nscd init script +Subject: [PATCH 17/30] Remove bash dependency for nscd init script The nscd init script uses #! /bin/bash but only really uses one bashism (translated strings), so remove them and switch the shell to #!/bin/sh. @@ -71,5 +71,5 @@ index a882da7d8b..b02986ec15 100644 ;; esac -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0017-eglibc-Cross-building-and-testing-instructions.patch b/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch similarity index 99% rename from meta/recipes-core/glibc/glibc/0017-eglibc-Cross-building-and-testing-instructions.patch rename to meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch index fd821323d7..fa8d127f7a 100644 --- a/meta/recipes-core/glibc/glibc/0017-eglibc-Cross-building-and-testing-instructions.patch +++ b/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch @@ -1,15 +1,15 @@ -From 897430bbb65a0f22284d7957206b5fd4efd6607f Mon Sep 17 00:00:00 2001 +From 448222134c9a0b147c4598f288ccc9d045b873c4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 00:42:58 +0000 -Subject: [PATCH 17/27] eglibc: Cross building and testing instructions +Subject: [PATCH 18/30] eglibc: Cross building and testing instructions Ported from eglibc Upstream-Status: Pending Signed-off-by: Khem Raj --- - GLIBC.cross-building | 383 +++++++++++++++++++++++++++++++++++++++++++++++++++ - GLIBC.cross-testing | 205 +++++++++++++++++++++++++++ + GLIBC.cross-building | 383 +++++++++++++++++++++++++++++++++++++++++++ + GLIBC.cross-testing | 205 +++++++++++++++++++++++ 2 files changed, 588 insertions(+) create mode 100644 GLIBC.cross-building create mode 100644 GLIBC.cross-testing @@ -615,5 +615,5 @@ index 0000000000..b67b468466 + simply place copies of these libraries in the top GLIBC build + directory. -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0018-eglibc-Help-bootstrap-cross-toolchain.patch b/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch similarity index 91% rename from meta/recipes-core/glibc/glibc/0018-eglibc-Help-bootstrap-cross-toolchain.patch rename to meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch index 80d547c80d..c7e8bd2ee9 100644 --- a/meta/recipes-core/glibc/glibc/0018-eglibc-Help-bootstrap-cross-toolchain.patch +++ b/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch @@ -1,7 +1,7 @@ -From fcfa19b69e8749477022161a808a201807ef72ec Mon Sep 17 00:00:00 2001 +From 6b8ee1ae86f8b9a49f751ab211002c83744356a6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 00:49:28 +0000 -Subject: [PATCH 18/27] eglibc: Help bootstrap cross toolchain +Subject: [PATCH 19/30] eglibc: Help bootstrap cross toolchain Taken from EGLIBC, r1484 + r1525 @@ -29,7 +29,7 @@ Signed-off-by: Khem Raj create mode 100644 include/stubs-bootstrap.h diff --git a/Makefile b/Makefile -index bea4e27f8d..8c83cfadc6 100644 +index d3f25a525a..ab383867e2 100644 --- a/Makefile +++ b/Makefile @@ -70,9 +70,18 @@ subdir-dirs = include @@ -52,7 +52,7 @@ index bea4e27f8d..8c83cfadc6 100644 ifeq (yes,$(build-shared)) headers += gnu/lib-names.h endif -@@ -152,6 +161,16 @@ others: $(common-objpfx)testrun.sh +@@ -195,6 +204,16 @@ others: $(common-objpfx)testrun.sh subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)$(dir)/stubs) @@ -69,7 +69,7 @@ index bea4e27f8d..8c83cfadc6 100644 ifndef abi-variants installed-stubs = $(inst_includedir)/gnu/stubs.h else -@@ -178,6 +197,7 @@ $(inst_includedir)/gnu/stubs.h: $(+force) +@@ -221,6 +240,7 @@ $(inst_includedir)/gnu/stubs.h: $(+force) install-others-nosubdir: $(installed-stubs) endif @@ -96,5 +96,5 @@ index 0000000000..1d2b669aff + EGLIBC subdir 'stubs' make targets, on every .o file in EGLIBC, but + an empty stubs.h like this will do fine for GCC. */ -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0019-eglibc-Clear-cache-lines-on-ppc8xx.patch b/meta/recipes-core/glibc/glibc/0020-eglibc-Clear-cache-lines-on-ppc8xx.patch similarity index 96% rename from meta/recipes-core/glibc/glibc/0019-eglibc-Clear-cache-lines-on-ppc8xx.patch rename to meta/recipes-core/glibc/glibc/0020-eglibc-Clear-cache-lines-on-ppc8xx.patch index 17bfe4fe84..d3f4b6a319 100644 --- a/meta/recipes-core/glibc/glibc/0019-eglibc-Clear-cache-lines-on-ppc8xx.patch +++ b/meta/recipes-core/glibc/glibc/0020-eglibc-Clear-cache-lines-on-ppc8xx.patch @@ -1,7 +1,7 @@ -From c6f2db0d7c5c65bfa19766a0e1ce8210111f9c7d Mon Sep 17 00:00:00 2001 +From 617ca176291df82c29d8c78e92ba8edcb38a2fe2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 31 Dec 2015 15:15:09 -0800 -Subject: [PATCH 19/27] eglibc: Clear cache lines on ppc8xx +Subject: [PATCH 20/30] eglibc: Clear cache lines on ppc8xx 2007-06-13 Nathan Sidwell Mark Shinwell @@ -79,5 +79,5 @@ index f2ad0c355d..3e6773795e 100644 break; #ifndef SHARED -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch b/meta/recipes-core/glibc/glibc/0021-eglibc-Resolve-__fpscr_values-on-SH4.patch similarity index 92% rename from meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch rename to meta/recipes-core/glibc/glibc/0021-eglibc-Resolve-__fpscr_values-on-SH4.patch index 09f7670758..881bd911fc 100644 --- a/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch +++ b/meta/recipes-core/glibc/glibc/0021-eglibc-Resolve-__fpscr_values-on-SH4.patch @@ -1,7 +1,7 @@ -From 577085016bb926a687abec145557fe8cb8f5af0e Mon Sep 17 00:00:00 2001 +From 78e379d65f4fc810fb095a97c4f36f0b79bb5e01 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 00:55:53 +0000 -Subject: [PATCH 20/27] eglibc: Resolve __fpscr_values on SH4 +Subject: [PATCH 21/30] eglibc: Resolve __fpscr_values on SH4 2010-09-29 Nobuhiro Iwamatsu Andrew Stubbs @@ -52,5 +52,5 @@ index c4e28ffb98..648bae03d5 100644 +weak_alias (___fpscr_values, __fpscr_values) + -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch b/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch index a629ce141a..04a5be7fcb 100644 --- a/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch +++ b/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch @@ -1,24 +1,24 @@ -From e019fe6a2b410db6043e21803f497b5cbdd90a83 Mon Sep 17 00:00:00 2001 +From 3e24f9d63aef5561b80fc7c345ce61943910e69b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2015 01:33:49 +0000 -Subject: [PATCH 22/27] eglibc: Forward port cross locale generation support +Subject: [PATCH 22/30] eglibc: Forward port cross locale generation support Upstream-Status: Pending Signed-off-by: Khem Raj --- - locale/Makefile | 3 ++- - locale/catnames.c | 48 +++++++++++++++++++++++++++++++++++ + locale/Makefile | 3 +- + locale/catnames.c | 48 ++++++++++++++++++++++++++++ locale/localeinfo.h | 2 +- - locale/programs/charmap-dir.c | 6 +++++ - locale/programs/ld-collate.c | 17 ++++++------- - locale/programs/ld-ctype.c | 27 ++++++++++---------- - locale/programs/ld-time.c | 31 +++++++++++++++-------- + locale/programs/charmap-dir.c | 6 ++++ + locale/programs/ld-collate.c | 17 +++++----- + locale/programs/ld-ctype.c | 27 ++++++++-------- + locale/programs/ld-time.c | 31 ++++++++++++------ locale/programs/linereader.c | 2 +- - locale/programs/localedef.c | 8 ++++++ - locale/programs/locfile.c | 5 +++- - locale/programs/locfile.h | 59 +++++++++++++++++++++++++++++++++++++++++-- - locale/setlocale.c | 30 ---------------------- + locale/programs/localedef.c | 8 +++++ + locale/programs/locfile.c | 5 ++- + locale/programs/locfile.h | 59 +++++++++++++++++++++++++++++++++-- + locale/setlocale.c | 30 ------------------ 12 files changed, 169 insertions(+), 69 deletions(-) create mode 100644 locale/catnames.c @@ -91,7 +91,7 @@ index 0000000000..9fad357db1 + [LC_ALL] = sizeof ("LC_ALL") - 1 + }; diff --git a/locale/localeinfo.h b/locale/localeinfo.h -index 68822a6319..fa36123776 100644 +index 537bc35149..73ba20d695 100644 --- a/locale/localeinfo.h +++ b/locale/localeinfo.h @@ -224,7 +224,7 @@ __libc_tsd_define (extern, locale_t, LOCALE) @@ -562,5 +562,5 @@ index e4de907e1f..b5d8f5c17d 100644 # define WEAK_POSTLOAD(postload) weak_extern (postload) #else -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch b/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch index ae708ef83e..092e90e5e3 100644 --- a/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch +++ b/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch @@ -1,7 +1,7 @@ -From 9d71526be21abe68dd8ca3a5a219445851bbc2f4 Mon Sep 17 00:00:00 2001 +From 24f3fbd925b6af96c4369184528028b144b51310 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 20 Apr 2016 21:11:00 -0700 -Subject: [PATCH 23/27] Define DUMMY_LOCALE_T if not defined +Subject: [PATCH 23/30] Define DUMMY_LOCALE_T if not defined This is a hack to fix building the locale bits on an older CentOs 5.X machine @@ -28,5 +28,5 @@ index 9956cd8446..04342f3644 100644 #define PACKAGE _libc_intl_domainname #ifndef VERSION -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch b/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch index 42ff667811..c78b4a3325 100644 --- a/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch +++ b/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch @@ -1,7 +1,7 @@ -From 03873af286f1dab1062f598d6deb774ce513421d Mon Sep 17 00:00:00 2001 +From 9f02a73c41782688f43e01bc2adbba09fc83b51e Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 18 Aug 2016 14:07:58 -0500 -Subject: [PATCH 24/27] elf/dl-deps.c: Make _dl_build_local_scope breadth first +Subject: [PATCH 24/30] elf/dl-deps.c: Make _dl_build_local_scope breadth first According to the ELF specification: @@ -24,10 +24,10 @@ Signed-off-by: Mark Hatle 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/elf/dl-deps.c b/elf/dl-deps.c -index c975fcffd7..6ee58c74e0 100644 +index 9d9b1ba7f2..8414028c58 100644 --- a/elf/dl-deps.c +++ b/elf/dl-deps.c -@@ -72,13 +72,19 @@ _dl_build_local_scope (struct link_map **list, struct link_map *map) +@@ -73,13 +73,19 @@ _dl_build_local_scope (struct link_map **list, struct link_map *map) { struct link_map **p = list; struct link_map **q; @@ -52,5 +52,5 @@ index c975fcffd7..6ee58c74e0 100644 } -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0025-locale-fix-hard-coded-reference-to-gcc-E.patch b/meta/recipes-core/glibc/glibc/0025-locale-fix-hard-coded-reference-to-gcc-E.patch index 7f5d1421d3..5eb1a019a4 100644 --- a/meta/recipes-core/glibc/glibc/0025-locale-fix-hard-coded-reference-to-gcc-E.patch +++ b/meta/recipes-core/glibc/glibc/0025-locale-fix-hard-coded-reference-to-gcc-E.patch @@ -1,7 +1,7 @@ -From 56dab024751941c07eb479f47ef6682e2168c86a Mon Sep 17 00:00:00 2001 +From 985b3d9e9b3f99f5a23c0c68e8657e311ca6f42d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rosen?= Date: Mon, 22 Aug 2016 16:09:25 +0200 -Subject: [PATCH 25/27] locale: fix hard-coded reference to gcc -E +Subject: [PATCH 25/30] locale: fix hard-coded reference to gcc -E When new version of compilers are published, they may not be compatible with older versions of software. This is particularly common when software is built @@ -34,5 +34,5 @@ index 30d3f2f195..e97653017c 100644 sub cstrlen { -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0026-reset-dl_load_write_lock-after-forking.patch b/meta/recipes-core/glibc/glibc/0026-reset-dl_load_write_lock-after-forking.patch index eca1193dd3..ad10b3c715 100644 --- a/meta/recipes-core/glibc/glibc/0026-reset-dl_load_write_lock-after-forking.patch +++ b/meta/recipes-core/glibc/glibc/0026-reset-dl_load_write_lock-after-forking.patch @@ -1,7 +1,7 @@ -From 847d37d5a34e4bf294de4ba98de3668950e28bc7 Mon Sep 17 00:00:00 2001 +From c26abfc71ef461ef4980f57a35870b68826bd619 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 27 Jan 2018 10:05:07 -0800 -Subject: [PATCH 26/27] reset dl_load_write_lock after forking +Subject: [PATCH 26/30] reset dl_load_write_lock after forking The patch in this Bugzilla entry was requested by a customer: @@ -20,10 +20,10 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c -index 846fa49ef2..f87506f398 100644 +index ec56a827eb..0f48933ff1 100644 --- a/sysdeps/nptl/fork.c +++ b/sysdeps/nptl/fork.c -@@ -194,9 +194,9 @@ __libc_fork (void) +@@ -130,9 +130,9 @@ __libc_fork (void) _IO_list_resetlock (); } @@ -33,8 +33,8 @@ index 846fa49ef2..f87506f398 100644 - + __rtld_lock_initialize (GL(dl_load_write_lock)); /* Run the handlers registered for the child. */ - while (allp != NULL) - { + __run_fork_handlers (atfork_run_child); + } -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch b/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch index 9ec234bd51..1ad14b7fc3 100644 --- a/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch +++ b/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch @@ -1,7 +1,7 @@ -From 94225ab4bcc1613531558a632270b5edce779bc9 Mon Sep 17 00:00:00 2001 +From c3e04a90dd762cad4ee9bd7564d74e052781be5c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 27 Jan 2018 10:08:04 -0800 -Subject: [PATCH 27/27] Acquire ld.so lock before switching to malloc_atfork +Subject: [PATCH 27/30] Acquire ld.so lock before switching to malloc_atfork The patch is from https://sourceware.org/bugzilla/show_bug.cgi?id=4578 @@ -28,11 +28,11 @@ Signed-off-by: Yuanjie Huang Signed-off-by: Zhixiong Chi Signed-off-by: Khem Raj --- - sysdeps/nptl/fork.c | 9 +++++++++ - 1 file changed, 9 insertions(+) + sysdeps/nptl/fork.c | 7 +++++++ + 1 file changed, 7 insertions(+) diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c -index f87506f398..225e7b51f8 100644 +index 0f48933ff1..eef3f9669b 100644 --- a/sysdeps/nptl/fork.c +++ b/sysdeps/nptl/fork.c @@ -25,6 +25,7 @@ @@ -43,22 +43,20 @@ index f87506f398..225e7b51f8 100644 #include #include #include -@@ -60,6 +61,10 @@ __libc_fork (void) - but our current fork implementation is not. */ +@@ -56,6 +57,9 @@ __libc_fork (void) bool multiple_threads = THREAD_GETMEM (THREAD_SELF, header.multiple_threads); + __run_fork_handlers (atfork_run_prepare); + /* grab ld.so lock BEFORE switching to malloc_atfork */ + __rtld_lock_lock_recursive (GL(dl_load_lock)); + __rtld_lock_lock_recursive (GL(dl_load_write_lock)); -+ - /* Run all the registered preparation handlers. In reverse order. - While doing this we build up a list of all the entries. */ - struct fork_handler *runp; -@@ -246,6 +251,10 @@ __libc_fork (void) - allp = allp->next; - } -+ + /* If we are not running multiple threads, we do not have to + preserve lock state. If fork runs from a signal handler, only +@@ -150,6 +154,9 @@ __libc_fork (void) + + /* Run the handlers registered for the parent. */ + __run_fork_handlers (atfork_run_parent); + /* unlock ld.so last, because we locked it first */ + __rtld_lock_unlock_recursive (GL(dl_load_write_lock)); + __rtld_lock_unlock_recursive (GL(dl_load_lock)); @@ -66,5 +64,5 @@ index f87506f398..225e7b51f8 100644 return pid; -- -2.16.1 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch b/meta/recipes-core/glibc/glibc/0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch index 436c84778e..8f0b05694f 100644 --- a/meta/recipes-core/glibc/glibc/0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch +++ b/meta/recipes-core/glibc/glibc/0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch @@ -1,8 +1,8 @@ -From af3054b3856379d353a779801678f330e1b58c9a Mon Sep 17 00:00:00 2001 -Message-Id: +From 55cc59b7da97b80cd26027656a252082b09aa2bb Mon Sep 17 00:00:00 2001 From: Pratyush Anand Date: Wed, 22 Mar 2017 17:02:38 +0530 -Subject: [PATCH] bits/siginfo-consts.h: enum definition for TRAP_HWBKPT is missing +Subject: [PATCH 28/30] bits/siginfo-consts.h: enum definition for TRAP_HWBKPT + is missing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -29,7 +29,7 @@ Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=2128 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/bits/siginfo-consts.h b/bits/siginfo-consts.h -index a58ac4b..8448fac 100644 +index 7464c1882b..298314527a 100644 --- a/bits/siginfo-consts.h +++ b/bits/siginfo-consts.h @@ -106,8 +106,12 @@ enum @@ -47,10 +47,10 @@ index a58ac4b..8448fac 100644 # endif diff --git a/sysdeps/unix/sysv/linux/bits/siginfo-consts.h b/sysdeps/unix/sysv/linux/bits/siginfo-consts.h -index 525840c..57a9edb 100644 +index 193bd9c471..3fe852bc5f 100644 --- a/sysdeps/unix/sysv/linux/bits/siginfo-consts.h +++ b/sysdeps/unix/sysv/linux/bits/siginfo-consts.h -@@ -137,8 +137,12 @@ enum +@@ -141,8 +141,12 @@ enum { TRAP_BRKPT = 1, /* Process breakpoint. */ # define TRAP_BRKPT TRAP_BRKPT @@ -65,5 +65,5 @@ index 525840c..57a9edb 100644 # endif -- -2.7.4 +2.18.0 diff --git a/meta/recipes-core/glibc/glibc/0029-Replace-strncpy-with-memccpy-to-fix-Wstringop-trunca.patch b/meta/recipes-core/glibc/glibc/0029-Replace-strncpy-with-memccpy-to-fix-Wstringop-trunca.patch deleted file mode 100644 index fa29f4165b..0000000000 --- a/meta/recipes-core/glibc/glibc/0029-Replace-strncpy-with-memccpy-to-fix-Wstringop-trunca.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 113e0516fbd3ce18253f0423762416d4c4b38fb0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 22 Mar 2018 17:57:37 -0700 -Subject: [PATCH 29/29] Replace strncpy with memccpy to fix - -Wstringop-truncation. - - * nis/nss_nisplus/nisplus-parser.c: Replace strncpy with memcpy to - avoid -Wstringop-truncation. ---- -Signed-off-by: Khem Raj -Upstream-Status: Submitted [https://sourceware.org/ml/libc-alpha/2018-03/msg00531.html] - - nis/nss_nisplus/nisplus-parser.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nis/nss_nisplus/nisplus-parser.c b/nis/nss_nisplus/nisplus-parser.c -index 8dc021e73d..b53284f889 100644 ---- a/nis/nss_nisplus/nisplus-parser.c -+++ b/nis/nss_nisplus/nisplus-parser.c -@@ -87,7 +87,7 @@ _nss_nisplus_parse_pwent (nis_result *result, struct passwd *pw, - if (len >= room_left) - goto no_more_room; - -- strncpy (first_unused, numstr, len); -+ memcpy (first_unused, numstr, len); - first_unused[len] = '\0'; - numstr = first_unused; - } -@@ -103,7 +103,7 @@ _nss_nisplus_parse_pwent (nis_result *result, struct passwd *pw, - if (len >= room_left) - goto no_more_room; - -- strncpy (first_unused, numstr, len); -+ memcpy (first_unused, numstr, len); - first_unused[len] = '\0'; - numstr = first_unused; - } --- -2.16.2 - diff --git a/meta/recipes-core/glibc/glibc/archive-path.patch b/meta/recipes-core/glibc/glibc/0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch similarity index 69% rename from meta/recipes-core/glibc/glibc/archive-path.patch rename to meta/recipes-core/glibc/glibc/0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch index b0d3158cfe..aa3a9e2654 100644 --- a/meta/recipes-core/glibc/glibc/archive-path.patch +++ b/meta/recipes-core/glibc/glibc/0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch @@ -1,13 +1,25 @@ -localedef --add-to-archive uses a hard-coded locale path which doesn't exist in -normal use, and there's no way to pass an alternative filename. +From 5a6f019ded549faaf42478f6f96428dc7c20606e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 3 Aug 2018 09:42:06 -0700 +Subject: [PATCH 29/30] localedef --add-to-archive uses a hard-coded locale + path -Add a fallback of $LOCALEARCHIVE from the environment, and allow creation of new locale archives that are not the system archive. +it doesn't exist in normal use, and there's no way to pass an +alternative filename. + +Add a fallback of $LOCALEARCHIVE from the environment, and allow +creation of new locale archives that are not the system archive. Upstream-Status: Inappropriate (OE-specific) + Signed-off-by: Ross Burton +Signed-off-by: Khem Raj +--- + locale/programs/locarchive.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c -index ca332a34..6b7ba9b2 100644 +index ca332a345f..6b7ba9b2e3 100644 --- a/locale/programs/locarchive.c +++ b/locale/programs/locarchive.c @@ -569,10 +569,13 @@ open_archive (struct locarhandle *ah, bool readonly) @@ -37,3 +49,6 @@ index ca332a34..6b7ba9b2 100644 { if (readonly) { +-- +2.18.0 + diff --git a/meta/recipes-core/glibc/glibc/0030-plural_c_no_preprocessor_lines.patch b/meta/recipes-core/glibc/glibc/0030-intl-Emit-no-lines-in-bison-generated-files.patch similarity index 59% rename from meta/recipes-core/glibc/glibc/0030-plural_c_no_preprocessor_lines.patch rename to meta/recipes-core/glibc/glibc/0030-intl-Emit-no-lines-in-bison-generated-files.patch index 6f03e1c62d..f0a950aca9 100644 --- a/meta/recipes-core/glibc/glibc/0030-plural_c_no_preprocessor_lines.patch +++ b/meta/recipes-core/glibc/glibc/0030-intl-Emit-no-lines-in-bison-generated-files.patch @@ -1,16 +1,26 @@ +From 959f3fc8743cbb3b13c3be11ee359f139f5be8c7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 3 Aug 2018 09:44:00 -0700 +Subject: [PATCH 30/30] intl: Emit no lines in bison generated files + Improve reproducibility: Do not put any #line preprocessor commands in bison generated files. These lines contain absolute paths containing file locations on the host build machine. Upstream-Status: Pending + Signed-off-by: Juro Bystricky +Signed-off-by: Khem Raj +--- + intl/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intl/Makefile b/intl/Makefile -index 2219717..a203780 100644 +index 672edf1b38..d31888d013 100644 --- a/intl/Makefile +++ b/intl/Makefile -@@ -151,7 +151,7 @@ $(objpfx)tst-gettext6.out: $(objpfx)tst-gettext.out +@@ -155,7 +155,7 @@ $(objpfx)tst-gettext6.out: $(objpfx)tst-gettext.out CPPFLAGS += -D'LOCALEDIR="$(localedir)"' \ -D'LOCALE_ALIAS_PATH="$(localedir)"' @@ -19,3 +29,6 @@ index 2219717..a203780 100644 $(inst_localedir)/locale.alias: locale.alias $(+force) $(do-install) +-- +2.18.0 + diff --git a/meta/recipes-core/glibc/glibc/0031-nativesdk-deprecate-libcrypt.patch b/meta/recipes-core/glibc/glibc/0031-nativesdk-deprecate-libcrypt.patch deleted file mode 100644 index a9132ed3d2..0000000000 --- a/meta/recipes-core/glibc/glibc/0031-nativesdk-deprecate-libcrypt.patch +++ /dev/null @@ -1,419 +0,0 @@ -Background information: - -https://sourceware.org/ml/libc-alpha/2017-08/msg01257.html -https://fedoraproject.org/wiki/Changes/Replace_glibc_libcrypt_with_libxcrypt - -Upstream-Status: Submitted [libc-alpha@sourceware.org] -Signed-off-by: Richard Purdie - -From: Zack Weinberg -Subject: [PATCH] Deprecate libcrypt and don't build it by default - -Back in June, Björn Esser proposed to add OpenBSD-compatible bcrypt -support to our implementation of crypt(3), and Zack Weinberg replied -that it might actually make more sense to _remove_ libcrypt from -glibc, freeing up libcrypt.so.1 and crypt.h to be provided by a -separate project that could move faster. (For instance, libxcrypt: -https://github.com/besser82/libxcrypt) - -This patch disables build and installation of libcrypt by default. It -can be re-enabled with --enable-obsolete-crypt to configure. Unlike -libnsl, we do *not* install a runtime shared library; that's left to -the replacement. (Unlike the SunRPC situation, I think we can -probably drop this code altogether in a release or two.) - -The function prototypes for crypt and encrypt are removed from -unistd.h, and the function prototype for setkey is removed from -stdlib.h; they do *not* come back with --enable-obsolete-crypt. This -means glibc no longer provides the POSIX CRYPT option, and the macro -_XOPEN_CRYPT is also removed from unistd.h to indicate that. -(_SC_XOPEN_CRYPT is still defined, but sysconf(_SC_XOPEN_CRYPT) will -return -1 at runtime.) These functions are also unconditionally -removed from conform/data/{stdlib,unistd}.h-data. - - * posix/unistd.h (_XOPEN_CRYPT, crypt, encrypt): Don't declare. - * stdlib/stdlib.h (setkey): Don't declare. - - * configure.ac (--enable-obsolete-crypt): New configure option. - * configure: Regenerate. - * config.make.in (build-obsolete-crypt): New makefile variable. - * crypt/Banner: Delete file. - * crypt/Makefile: Don't build anything unless - $(build-obsolete-crypt) is 'yes'. - * sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile: Only add things - to libcrypt-sysdep_routines when $(build-obsolete-crypt) is 'yes'. - * sysdeps/sparc/sparc64/multiarch/Makefile: Likewise. - * sysdeps/unix/sysv/linux/arm/Makefile: Likewise. - - * conform/Makefile: Only include libcrypt.a in linknamespace tests - when $(build-obsolete-crypt) is 'yes'. - * conform/data/stdlib.h-data (setkey): Don't expect. - * conform/data/unistd.h-data (crypt, encrypt): Don't expect. - * elf/Makefile: Only perform various tests of libcrypt.so/libcrypt.a - when $(build-obsolete-crypt) is 'yes'. - * elf/tst-linkall-static.c: Don't include crypt.h when USE_CRYPT - is false. ---- - NEWS | 18 ++++++++++++++++++ - config.make.in | 1 + - configure | 13 +++++++++++++ - configure.ac | 8 ++++++++ - conform/Makefile | 14 ++++++++++---- - conform/data/stdlib.h-data | 3 --- - conform/data/unistd.h-data | 6 ------ - crypt/Makefile | 5 +++++ - elf/Makefile | 16 ++++++++++++---- - elf/tst-linkall-static.c | 2 ++ - posix/unistd.h | 16 ---------------- - stdlib/stdlib.h | 6 ------ - sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile | 2 ++ - sysdeps/sparc/sparc64/multiarch/Makefile | 2 ++ - sysdeps/unix/sysv/linux/arm/Makefile | 2 ++ - 15 files changed, 75 insertions(+), 39 deletions(-) - -diff --git a/config.make.in b/config.make.in -index 9e5e24b2c6..8fe610d04d 100644 ---- a/config.make.in -+++ b/config.make.in -@@ -82,6 +82,7 @@ mach-interface-list = @mach_interface_list@ - - experimental-malloc = @experimental_malloc@ - -+build-obsolete-crypt = @build_obsolete_crypt@ - nss-crypt = @libc_cv_nss_crypt@ - static-nss-crypt = @libc_cv_static_nss_crypt@ - -diff --git a/configure b/configure -index 7a8bd3f817..46f6bd7f86 100755 ---- a/configure -+++ b/configure -@@ -672,6 +672,7 @@ base_machine - have_tunables - build_pt_chown - build_nscd -+build_obsolete_crypt - build_obsolete_nsl - link_obsolete_rpc - libc_cv_static_nss_crypt -@@ -782,6 +783,7 @@ enable_experimental_malloc - enable_nss_crypt - enable_obsolete_rpc - enable_obsolete_nsl -+enable_obsolete_crypt - enable_systemtap - enable_build_nscd - enable_nscd -@@ -1453,6 +1455,7 @@ Optional Features: - link-time usage - --enable-obsolete-nsl build and install the obsolete libnsl library and - depending NSS modules -+ --enable-obsolete-crypt build and install the obsolete libcrypt library - --enable-systemtap enable systemtap static probe points [default=no] - --disable-build-nscd disable building and installing the nscd daemon - --disable-nscd library functions will not contact the nscd daemon -@@ -3632,6 +3635,16 @@ if test "$build_obsolete_nsl" = yes; then - - fi - -+# Check whether --enable-obsolete-crypt was given. -+if test "${enable_obsolete_crypt+set}" = set; then : -+ enableval=$enable_obsolete_crypt; build_obsolete_crypt=$enableval -+else -+ build_obsolete_crypt=no -+fi -+ -+ -+ -+ - # Check whether --enable-systemtap was given. - if test "${enable_systemtap+set}" = set; then : - enableval=$enable_systemtap; systemtap=$enableval -diff --git a/configure.ac b/configure.ac -index ca1282a6b3..0142353740 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -378,6 +378,14 @@ if test "$build_obsolete_nsl" = yes; then - AC_DEFINE(LINK_OBSOLETE_NSL) - fi - -+AC_ARG_ENABLE([obsolete-crypt], -+ AC_HELP_STRING([--enable-obsolete-crypt], -+ [build and install the obsolete libcrypt library]), -+ [build_obsolete_crypt=$enableval], -+ [build_obsolete_crypt=no]) -+AC_SUBST(build_obsolete_crypt) -+ -+ - AC_ARG_ENABLE([systemtap], - [AS_HELP_STRING([--enable-systemtap], - [enable systemtap static probe points @<:@default=no@:>@])], -diff --git a/conform/Makefile b/conform/Makefile -index 864fdeca21..5ef474fb24 100644 ---- a/conform/Makefile -+++ b/conform/Makefile -@@ -193,22 +193,28 @@ linknamespace-libs-thr = $(linknamespace-libs-isoc) \ - $(common-objpfx)rt/librt.a $(static-thread-library) - linknamespace-libs-posix = $(linknamespace-libs-thr) \ - $(common-objpfx)dlfcn/libdl.a --linknamespace-libs-xsi = $(linknamespace-libs-posix) \ -- $(common-objpfx)crypt/libcrypt.a -+linknamespace-libs-xsi = $(linknamespace-libs-posix) - linknamespace-libs-ISO = $(linknamespace-libs-isoc) - linknamespace-libs-ISO99 = $(linknamespace-libs-isoc) - linknamespace-libs-ISO11 = $(linknamespace-libs-isoc) --linknamespace-libs-XPG4 = $(linknamespace-libs-isoc) \ -- $(common-objpfx)crypt/libcrypt.a -+linknamespace-libs-XPG4 = $(linknamespace-libs-isoc) - linknamespace-libs-XPG42 = $(linknamespace-libs-XPG4) - linknamespace-libs-POSIX = $(linknamespace-libs-thr) - linknamespace-libs-UNIX98 = $(linknamespace-libs-xsi) - linknamespace-libs-XOPEN2K = $(linknamespace-libs-xsi) - linknamespace-libs-POSIX2008 = $(linknamespace-libs-posix) - linknamespace-libs-XOPEN2K8 = $(linknamespace-libs-xsi) -+ -+ifeq ($(build-obsolete-crypt),yes) -+linknamespace-libs-xsi += $(common-objpfx)crypt/libcrypt.a -+linknamespace-libs-XPG4 += $(common-objpfx)crypt/libcrypt.a -+endif -+ - linknamespace-libs = $(foreach std,$(conformtest-standards),\ - $(linknamespace-libs-$(std))) - -+ -+ - $(linknamespace-symlist-stdlibs-tests): $(objpfx)symlist-stdlibs-%: \ - $(linknamespace-libs) - LC_ALL=C $(READELF) -W -s $(linknamespace-libs-$*) > $@; \ -diff --git a/conform/data/stdlib.h-data b/conform/data/stdlib.h-data -index d8fcccc2fb..6913828196 100644 ---- a/conform/data/stdlib.h-data -+++ b/conform/data/stdlib.h-data -@@ -149,9 +149,6 @@ function {unsigned short int*} seed48 (unsigned short int[3]) - #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG4 && !defined XPG42 && !defined UNIX98 - function int setenv (const char*, const char*, int) - #endif --#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 --function void setkey (const char*) --#endif - #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG4 && !defined POSIX && !defined POSIX2008 - function {char*} setstate (char*) - #endif -diff --git a/conform/data/unistd.h-data b/conform/data/unistd.h-data -index ddf4f25132..aa070528e8 100644 ---- a/conform/data/unistd.h-data -+++ b/conform/data/unistd.h-data -@@ -437,9 +437,6 @@ function int chroot (const char*) - function int chown (const char*, uid_t, gid_t) - function int close (int) - function size_t confstr (int, char*, size_t) --#if !defined POSIX && !defined POSIX2008 --function {char*} crypt (const char*, const char*) --#endif - #if defined XPG4 || defined XPG42 || defined UNIX98 - function {char*} ctermid (char*) - function {char*} cuserid (char*) -@@ -449,9 +446,6 @@ allow cuserid - #endif - function int dup (int) - function int dup2 (int, int) --#if !defined POSIX && !defined POSIX2008 --function void encrypt (char[64], int) --#endif - function int execl (const char*, const char*, ...) - function int execle (const char*, const char*, ...) - function int execlp (const char*, const char*, ...) -diff --git a/crypt/Makefile b/crypt/Makefile -index 303800df73..024ec2c6ab 100644 ---- a/crypt/Makefile -+++ b/crypt/Makefile -@@ -22,6 +22,8 @@ subdir := crypt - - include ../Makeconfig - -+ifeq ($(build-obsolete-crypt),yes) -+ - headers := crypt.h - - extra-libs := libcrypt -@@ -52,9 +54,11 @@ tests += md5test sha256test sha512test - # machine over a minute. - xtests = md5test-giant - endif -+endif - - include ../Rules - -+ifeq ($(build-obsolete-crypt),yes) - ifneq ($(nss-crypt),yes) - md5-routines := md5 $(filter md5%,$(libcrypt-sysdep_routines)) - sha256-routines := sha256 $(filter sha256%,$(libcrypt-sysdep_routines)) -@@ -71,3 +75,4 @@ $(addprefix $(objpfx),$(tests)): $(objpfx)libcrypt.so - else - $(addprefix $(objpfx),$(tests)): $(objpfx)libcrypt.a - endif -+endif -diff --git a/elf/Makefile b/elf/Makefile -index 2a432d8bee..366f7b80ec 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -385,15 +385,19 @@ $(objpfx)tst-_dl_addr_inside_object: $(objpfx)dl-addr-obj.os - CFLAGS-tst-_dl_addr_inside_object.c += $(PIE-ccflag) - endif - --# By default tst-linkall-static should try to use crypt routines to test --# static libcrypt use. --CFLAGS-tst-linkall-static.c += -DUSE_CRYPT=1 -+ifeq ($(build-obsolete-crypt),yes) -+# If the libcrypt library is being built, tst-linkall-static should -+# try to use crypt routines to test static libcrypt use. -+CFLAGS-tst-linkall-static.c = -DUSE_CRYPT=1 - # However, if we are using NSS crypto and we don't have a static - # library, then we exclude the use of crypt functions in the test. - # We similarly exclude libcrypt.a from the static link (see below). - ifeq (yesno,$(nss-crypt)$(static-nss-crypt)) - CFLAGS-tst-linkall-static.c += -UUSE_CRYPT -DUSE_CRYPT=0 - endif -+else -+CFLAGS-tst-linkall-static.c = -DUSE_CRYPT=0 -+endif - - include ../Rules - -@@ -1113,8 +1117,10 @@ localplt-built-dso := $(addprefix $(common-objpfx),\ - rt/librt.so \ - dlfcn/libdl.so \ - resolv/libresolv.so \ -- crypt/libcrypt.so \ - ) -+ifeq ($(build-obsolete-crypt),yes) -+localplt-built-dso += $(addprefix $(common-objpfx), crypt/libcrypt.so) -+endif - ifeq ($(build-mathvec),yes) - localplt-built-dso += $(addprefix $(common-objpfx), mathvec/libmvec.so) - endif -@@ -1395,6 +1401,7 @@ $(objpfx)tst-linkall-static: \ - $(common-objpfx)resolv/libanl.a \ - $(static-thread-library) - -+ifeq ($(build-obsolete-crypt),yes) - # If we are using NSS crypto and we have the ability to link statically - # then we include libcrypt.a, otherwise we leave out libcrypt.a and - # link as much as we can into the tst-linkall-static test. This assumes -@@ -1410,6 +1417,7 @@ ifeq (no,$(nss-crypt)) - $(objpfx)tst-linkall-static: \ - $(common-objpfx)crypt/libcrypt.a - endif -+endif - - # The application depends on the DSO, and the DSO loads the plugin. - # The plugin also depends on the DSO. This creates the circular -diff --git a/elf/tst-linkall-static.c b/elf/tst-linkall-static.c -index e8df38f74e..0ffae7c723 100644 ---- a/elf/tst-linkall-static.c -+++ b/elf/tst-linkall-static.c -@@ -18,7 +18,9 @@ - - #include - #include -+#if USE_CRYPT - #include -+#endif - #include - #include - #include -diff --git a/posix/unistd.h b/posix/unistd.h -index 4d149f9945..e75ce4d4ec 100644 ---- a/posix/unistd.h -+++ b/posix/unistd.h -@@ -107,9 +107,6 @@ __BEGIN_DECLS - /* The X/Open Unix extensions are available. */ - #define _XOPEN_UNIX 1 - --/* Encryption is present. */ --#define _XOPEN_CRYPT 1 -- - /* The enhanced internationalization capabilities according to XPG4.2 - are present. */ - #define _XOPEN_ENH_I18N 1 -@@ -1118,20 +1115,7 @@ ssize_t copy_file_range (int __infd, __off64_t *__pinoff, - extern int fdatasync (int __fildes); - #endif /* Use POSIX199309 */ - -- --/* XPG4.2 specifies that prototypes for the encryption functions must -- be defined here. */ - #ifdef __USE_XOPEN --/* Encrypt at most 8 characters from KEY using salt to perturb DES. */ --extern char *crypt (const char *__key, const char *__salt) -- __THROW __nonnull ((1, 2)); -- --/* Encrypt data in BLOCK in place if EDFLAG is zero; otherwise decrypt -- block in place. */ --extern void encrypt (char *__glibc_block, int __edflag) -- __THROW __nonnull ((1)); -- -- - /* Swab pairs bytes in the first N bytes of the area pointed to by - FROM and copy the result to TO. The value of TO must not be in the - range [FROM - N + 1, FROM - 1]. If N is odd the first byte in FROM -diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h -index 6b1ead31e0..8e23e93557 100644 ---- a/stdlib/stdlib.h -+++ b/stdlib/stdlib.h -@@ -958,12 +958,6 @@ extern int getsubopt (char **__restrict __optionp, - #endif - - --#ifdef __USE_XOPEN --/* Setup DES tables according KEY. */ --extern void setkey (const char *__key) __THROW __nonnull ((1)); --#endif -- -- - /* X/Open pseudo terminal handling. */ - - #ifdef __USE_XOPEN2KXSI -diff --git a/sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile b/sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile -index a6d08f3a00..d8b8297fb0 100644 ---- a/sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile -+++ b/sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile -@@ -1,6 +1,8 @@ - ifeq ($(subdir),crypt) -+ifeq ($(build-obsolete-crypt),yes) - libcrypt-sysdep_routines += md5-crop sha256-crop sha512-crop - endif -+endif - - ifeq ($(subdir),locale) - localedef-aux += md5-crop -diff --git a/sysdeps/sparc/sparc64/multiarch/Makefile b/sysdeps/sparc/sparc64/multiarch/Makefile -index eaf758e7aa..0198f9886f 100644 ---- a/sysdeps/sparc/sparc64/multiarch/Makefile -+++ b/sysdeps/sparc/sparc64/multiarch/Makefile -@@ -1,6 +1,8 @@ - ifeq ($(subdir),crypt) -+ifeq ($(build-obsolete-crypt),yes) - libcrypt-sysdep_routines += md5-crop sha256-crop sha512-crop - endif -+endif - - ifeq ($(subdir),locale) - localedef-aux += md5-crop -diff --git a/sysdeps/unix/sysv/linux/arm/Makefile b/sysdeps/unix/sysv/linux/arm/Makefile -index 4adc35de04..6cab4f3a31 100644 ---- a/sysdeps/unix/sysv/linux/arm/Makefile -+++ b/sysdeps/unix/sysv/linux/arm/Makefile -@@ -19,8 +19,10 @@ endif - # Add a syscall function to each library that needs one. - - ifeq ($(subdir),crypt) -+ifeq ($(build-obsolete-crypt),yes) - libcrypt-sysdep_routines += libc-do-syscall - endif -+endif - - ifeq ($(subdir),rt) - librt-sysdep_routines += libc-do-syscall --- -2.16.0 - diff --git a/meta/recipes-core/glibc/glibc/CVE-2017-18269.patch b/meta/recipes-core/glibc/glibc/CVE-2017-18269.patch deleted file mode 100644 index d873c51e60..0000000000 --- a/meta/recipes-core/glibc/glibc/CVE-2017-18269.patch +++ /dev/null @@ -1,178 +0,0 @@ -From cd66c0e584c6d692bc8347b5e72723d02b8a8ada Mon Sep 17 00:00:00 2001 -From: Andrew Senkevich -Date: Fri, 23 Mar 2018 16:19:45 +0100 -Subject: [PATCH] Fix i386 memmove issue (bug 22644). - - [BZ #22644] - * sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S: Fixed - branch conditions. - * string/test-memmove.c (do_test2): New testcase. - -Upstream-Status: Backport -CVE: CVE-2017-18269 -Signed-off-by: Zhixiong Chi ---- - ChangeLog | 8 +++ - string/test-memmove.c | 58 ++++++++++++++++++++++ - .../i386/i686/multiarch/memcpy-sse2-unaligned.S | 12 ++--- - 3 files changed, 72 insertions(+), 6 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 18ed09e..afdb766 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,11 @@ -+2018-03-23 Andrew Senkevich -+ Max Horn -+ -+ [BZ #22644] -+ * sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S: Fixed -+ branch conditions. -+ * string/test-memmove.c (do_test2): New testcase. -+ - 2018-02-22 Andrew Waterman - - [BZ # 22884] -diff --git a/string/test-memmove.c b/string/test-memmove.c -index edc7a4c..64e3651 100644 ---- a/string/test-memmove.c -+++ b/string/test-memmove.c -@@ -24,6 +24,7 @@ - # define TEST_NAME "memmove" - #endif - #include "test-string.h" -+#include - - char *simple_memmove (char *, const char *, size_t); - -@@ -245,6 +246,60 @@ do_random_tests (void) - } - } - -+static void -+do_test2 (void) -+{ -+ size_t size = 0x20000000; -+ uint32_t * large_buf; -+ -+ large_buf = mmap ((void*) 0x70000000, size, PROT_READ | PROT_WRITE, -+ MAP_PRIVATE | MAP_ANON, -1, 0); -+ -+ if (large_buf == MAP_FAILED) -+ error (EXIT_UNSUPPORTED, errno, "Large mmap failed"); -+ -+ if ((uintptr_t) large_buf > 0x80000000 - 128 -+ || 0x80000000 - (uintptr_t) large_buf > 0x20000000) -+ { -+ error (0, 0, "Large mmap allocated improperly"); -+ ret = EXIT_UNSUPPORTED; -+ munmap ((void *) large_buf, size); -+ return; -+ } -+ -+ size_t bytes_move = 0x80000000 - (uintptr_t) large_buf; -+ size_t arr_size = bytes_move / sizeof (uint32_t); -+ size_t i; -+ -+ FOR_EACH_IMPL (impl, 0) -+ { -+ for (i = 0; i < arr_size; i++) -+ large_buf[i] = (uint32_t) i; -+ -+ uint32_t * dst = &large_buf[33]; -+ -+#ifdef TEST_BCOPY -+ CALL (impl, (char *) large_buf, (char *) dst, bytes_move); -+#else -+ CALL (impl, (char *) dst, (char *) large_buf, bytes_move); -+#endif -+ -+ for (i = 0; i < arr_size; i++) -+ { -+ if (dst[i] != (uint32_t) i) -+ { -+ error (0, 0, -+ "Wrong result in function %s dst \"%p\" src \"%p\" offset \"%zd\"", -+ impl->name, dst, large_buf, i); -+ ret = 1; -+ break; -+ } -+ } -+ } -+ -+ munmap ((void *) large_buf, size); -+} -+ - int - test_main (void) - { -@@ -284,6 +339,9 @@ test_main (void) - } - - do_random_tests (); -+ -+ do_test2 (); -+ - return ret; - } - -diff --git a/sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S b/sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S -index 9c3bbe7..9aa17de 100644 ---- a/sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S -+++ b/sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S -@@ -72,7 +72,7 @@ ENTRY (MEMCPY) - cmp %edx, %eax - - # ifdef USE_AS_MEMMOVE -- jg L(check_forward) -+ ja L(check_forward) - - L(mm_len_0_or_more_backward): - /* Now do checks for lengths. We do [0..16], [16..32], [32..64], [64..128] -@@ -81,7 +81,7 @@ L(mm_len_0_or_more_backward): - jbe L(mm_len_0_16_bytes_backward) - - cmpl $32, %ecx -- jg L(mm_len_32_or_more_backward) -+ ja L(mm_len_32_or_more_backward) - - /* Copy [0..32] and return. */ - movdqu (%eax), %xmm0 -@@ -92,7 +92,7 @@ L(mm_len_0_or_more_backward): - - L(mm_len_32_or_more_backward): - cmpl $64, %ecx -- jg L(mm_len_64_or_more_backward) -+ ja L(mm_len_64_or_more_backward) - - /* Copy [0..64] and return. */ - movdqu (%eax), %xmm0 -@@ -107,7 +107,7 @@ L(mm_len_32_or_more_backward): - - L(mm_len_64_or_more_backward): - cmpl $128, %ecx -- jg L(mm_len_128_or_more_backward) -+ ja L(mm_len_128_or_more_backward) - - /* Copy [0..128] and return. */ - movdqu (%eax), %xmm0 -@@ -132,7 +132,7 @@ L(mm_len_128_or_more_backward): - add %ecx, %eax - cmp %edx, %eax - movl SRC(%esp), %eax -- jle L(forward) -+ jbe L(forward) - PUSH (%esi) - PUSH (%edi) - PUSH (%ebx) -@@ -269,7 +269,7 @@ L(check_forward): - add %edx, %ecx - cmp %eax, %ecx - movl LEN(%esp), %ecx -- jle L(forward) -+ jbe L(forward) - - /* Now do checks for lengths. We do [0..16], [0..32], [0..64], [0..128] - separately. */ --- -2.9.3 diff --git a/meta/recipes-core/glibc/glibc/CVE-2018-11236.patch b/meta/recipes-core/glibc/glibc/CVE-2018-11236.patch deleted file mode 100644 index e2bb40b0de..0000000000 --- a/meta/recipes-core/glibc/glibc/CVE-2018-11236.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 5460617d1567657621107d895ee2dd83bc1f88f2 Mon Sep 17 00:00:00 2001 -From: Paul Pluzhnikov -Date: Tue, 8 May 2018 18:12:41 -0700 -Subject: [PATCH] Fix BZ 22786: integer addition overflow may cause stack - buffer overflow when realpath() input length is close to SSIZE_MAX. - -2018-05-09 Paul Pluzhnikov - - [BZ #22786] - * stdlib/canonicalize.c (__realpath): Fix overflow in path length - computation. - * stdlib/Makefile (test-bz22786): New test. - * stdlib/test-bz22786.c: New test. - -CVE: CVE-2018-11236 -Upstream-Status: Backport -Signed-off-by: Zhixiong Chi ---- - ChangeLog | 8 +++++ - stdlib/Makefile | 2 +- - stdlib/canonicalize.c | 2 +- - stdlib/test-bz22786.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 100 insertions(+), 2 deletions(-) - create mode 100644 stdlib/test-bz22786.c - -diff --git a/ChangeLog b/ChangeLog ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,11 @@ -+2018-05-09 Paul Pluzhnikov -+ -+ [BZ #22786] -+ * stdlib/canonicalize.c (__realpath): Fix overflow in path length -+ computation. -+ * stdlib/Makefile (test-bz22786): New test. -+ * stdlib/test-bz22786.c: New test. -+ - 2018-03-23 Andrew Senkevich - Max Horn - -diff --git a/stdlib/Makefile b/stdlib/Makefile -index af1643c..1ddb1f9 100644 ---- a/stdlib/Makefile -+++ b/stdlib/Makefile -@@ -84,7 +84,7 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ - tst-cxa_atexit tst-on_exit test-atexit-race \ - test-at_quick_exit-race test-cxa_atexit-race \ - test-on_exit-race test-dlclose-exit-race \ -- tst-makecontext-align -+ tst-makecontext-align test-bz22786 - - tests-internal := tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \ - tst-tls-atexit tst-tls-atexit-nodelete -diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c -index 4135f3f..390fb43 100644 ---- a/stdlib/canonicalize.c -+++ b/stdlib/canonicalize.c -@@ -181,7 +181,7 @@ __realpath (const char *name, char *resolved) - extra_buf = __alloca (path_max); - - len = strlen (end); -- if ((long int) (n + len) >= path_max) -+ if (path_max - n <= len) - { - __set_errno (ENAMETOOLONG); - goto error; -diff --git a/stdlib/test-bz22786.c b/stdlib/test-bz22786.c -new file mode 100644 -index 0000000..e7837f9 ---- /dev/null -+++ b/stdlib/test-bz22786.c -@@ -0,0 +1,90 @@ -+/* Bug 22786: test for buffer overflow in realpath. -+ Copyright (C) 2018 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library 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 -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+/* This file must be run from within a directory called "stdlib". */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static int -+do_test (void) -+{ -+ const char dir[] = "bz22786"; -+ const char lnk[] = "bz22786/symlink"; -+ -+ rmdir (dir); -+ if (mkdir (dir, 0755) != 0 && errno != EEXIST) -+ { -+ printf ("mkdir %s: %m\n", dir); -+ return EXIT_FAILURE; -+ } -+ if (symlink (".", lnk) != 0 && errno != EEXIST) -+ { -+ printf ("symlink (%s, %s): %m\n", dir, lnk); -+ return EXIT_FAILURE; -+ } -+ -+ const size_t path_len = (size_t) INT_MAX + 1; -+ -+ DIAG_PUSH_NEEDS_COMMENT; -+#if __GNUC_PREREQ (7, 0) -+ /* GCC 7 warns about too-large allocations; here we need such -+ allocation to succeed for the test to work. */ -+ DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than="); -+#endif -+ char *path = malloc (path_len); -+ DIAG_POP_NEEDS_COMMENT; -+ -+ if (path == NULL) -+ { -+ printf ("malloc (%zu): %m\n", path_len); -+ return EXIT_UNSUPPORTED; -+ } -+ -+ /* Construct very long path = "bz22786/symlink/aaaa....." */ -+ char *p = mempcpy (path, lnk, sizeof (lnk) - 1); -+ *(p++) = '/'; -+ memset (p, 'a', path_len - (path - p) - 2); -+ p[path_len - (path - p) - 1] = '\0'; -+ -+ /* This call crashes before the fix for bz22786 on 32-bit platforms. */ -+ p = realpath (path, NULL); -+ -+ if (p != NULL || errno != ENAMETOOLONG) -+ { -+ printf ("realpath: %s (%m)", p); -+ return EXIT_FAILURE; -+ } -+ -+ /* Cleanup. */ -+ unlink (lnk); -+ rmdir (dir); -+ -+ return 0; -+} -+ -+#define TEST_FUNCTION do_test -+#include --- -2.9.3 diff --git a/meta/recipes-core/glibc/glibc/CVE-2018-11237.patch b/meta/recipes-core/glibc/glibc/CVE-2018-11237.patch deleted file mode 100644 index 632aa565e4..0000000000 --- a/meta/recipes-core/glibc/glibc/CVE-2018-11237.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 9aaaab7c6e4176e61c59b0a63c6ba906d875dc0e Mon Sep 17 00:00:00 2001 -From: Andreas Schwab -Date: Tue, 22 May 2018 10:37:59 +0200 -Subject: [PATCH] Don't write beyond destination in - __mempcpy_avx512_no_vzeroupper (bug 23196) - -When compiled as mempcpy, the return value is the end of the destination -buffer, thus it cannot be used to refer to the start of it. - -2018-05-23 Andreas Schwab - - [BZ #23196] - CVE-2018-11237 - * sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S - (L(preloop_large)): Save initial destination pointer in %r11 and - use it instead of %rax after the loop. - * string/test-mempcpy.c (MIN_PAGE_SIZE): Define. - -CVE: CVE-2018-11237 -Upstream-Status: Backport -Signed-off-by: Zheng Ruoqin ---- - ChangeLog | 9 +++++++++ - string/test-mempcpy.c | 1 + - sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S | 5 +++-- - 3 files changed, 13 insertions(+), 2 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index fa0a07c..bc09dec 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,12 @@ -+2018-05-23 Andreas Schwab -+ -+ [BZ #23196] -+ CVE-2018-11237 -+ * sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S -+ (L(preloop_large)): Save initial destination pointer in %r11 and -+ use it instead of %rax after the loop. -+ * string/test-mempcpy.c (MIN_PAGE_SIZE): Define. -+ - 2018-05-09 Paul Pluzhnikov - - [BZ #22786] -diff --git a/string/test-mempcpy.c b/string/test-mempcpy.c -index c08fba8..d98ecdd 100644 ---- a/string/test-mempcpy.c -+++ b/string/test-mempcpy.c -@@ -18,6 +18,7 @@ - . */ - - #define MEMCPY_RESULT(dst, len) (dst) + (len) -+#define MIN_PAGE_SIZE 131072 - #define TEST_MAIN - #define TEST_NAME "mempcpy" - #include "test-string.h" -diff --git a/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S b/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S -index 23c0f7a..a55cf6f 100644 ---- a/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S -+++ b/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S -@@ -335,6 +335,7 @@ L(preloop_large): - ja L(preloop_large_bkw) - vmovups (%rsi), %zmm4 - vmovups 0x40(%rsi), %zmm5 -+ mov %rdi, %r11 - - /* Align destination for access with non-temporal stores in the loop. */ - mov %rdi, %r8 -@@ -366,8 +367,8 @@ L(gobble_256bytes_nt_loop): - cmp $256, %rdx - ja L(gobble_256bytes_nt_loop) - sfence -- vmovups %zmm4, (%rax) -- vmovups %zmm5, 0x40(%rax) -+ vmovups %zmm4, (%r11) -+ vmovups %zmm5, 0x40(%r11) - jmp L(check) - - L(preloop_large_bkw): --- -2.7.4 - diff --git a/meta/recipes-core/glibc/glibc_2.27.bb b/meta/recipes-core/glibc/glibc_2.28.bb similarity index 72% rename from meta/recipes-core/glibc/glibc_2.27.bb rename to meta/recipes-core/glibc/glibc_2.28.bb index b14c02cf2a..086daed04c 100644 --- a/meta/recipes-core/glibc/glibc_2.27.bb +++ b/meta/recipes-core/glibc/glibc_2.28.bb @@ -1,13 +1,13 @@ require glibc.inc -LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \ +LIC_FILES_CHKSUM = "file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" DEPENDS += "gperf-native bison-native" -SRCREV ?= "df3ff4e49d4ee3cbbdaeb0b1cb5dc2344c08be98" +SRCREV ?= "3c03baca37fdcb52c3881e653ca392bba7a99c2b" SRCBRANCH ?= "release/${PV}/master" @@ -19,22 +19,22 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://generate-supported.mk \ \ ${NATIVESDKFIXES} \ - file://0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch \ - file://0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch \ - file://0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch \ - file://0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch \ - file://0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch \ - file://0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ - file://0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch \ - file://0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch \ - file://0013-Add-unused-attribute.patch \ - file://0014-yes-within-the-path-sets-wrong-config-variables.patch \ - file://0015-timezone-re-written-tzselect-as-posix-sh.patch \ - file://0016-Remove-bash-dependency-for-nscd-init-script.patch \ - file://0017-eglibc-Cross-building-and-testing-instructions.patch \ - file://0018-eglibc-Help-bootstrap-cross-toolchain.patch \ - file://0019-eglibc-Clear-cache-lines-on-ppc8xx.patch \ - file://0020-eglibc-Resolve-__fpscr_values-on-SH4.patch \ + file://0006-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch \ + file://0007-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch \ + file://0008-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch \ + file://0009-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch \ + file://0010-Quote-from-bug-1443-which-explains-what-the-patch-do.patch \ + file://0011-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ + file://0012-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch \ + file://0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch \ + file://0014-Add-unused-attribute.patch \ + file://0015-yes-within-the-path-sets-wrong-config-variables.patch \ + file://0016-timezone-re-written-tzselect-as-posix-sh.patch \ + file://0017-Remove-bash-dependency-for-nscd-init-script.patch \ + file://0018-eglibc-Cross-building-and-testing-instructions.patch \ + file://0019-eglibc-Help-bootstrap-cross-toolchain.patch \ + file://0020-eglibc-Clear-cache-lines-on-ppc8xx.patch \ + file://0021-eglibc-Resolve-__fpscr_values-on-SH4.patch \ file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \ file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \ file://0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \ @@ -42,11 +42,8 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0026-reset-dl_load_write_lock-after-forking.patch \ file://0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch \ file://0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch \ - file://0029-Replace-strncpy-with-memccpy-to-fix-Wstringop-trunca.patch \ - file://0030-plural_c_no_preprocessor_lines.patch \ - file://CVE-2017-18269.patch \ - file://CVE-2018-11236.patch \ - file://CVE-2018-11237.patch \ + file://0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \ + file://0030-intl-Emit-no-lines-in-bison-generated-files.patch \ " NATIVESDKFIXES ?= "" @@ -55,8 +52,7 @@ NATIVESDKFIXES_class-nativesdk = "\ file://0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch \ file://0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch \ file://0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch \ - file://relocate-locales.patch \ - file://0031-nativesdk-deprecate-libcrypt.patch \ + file://0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch \ " S = "${WORKDIR}/git" From patchwork Mon Aug 6 22:56:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143529 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3806405ljj; Mon, 6 Aug 2018 15:57:43 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd6qMcyhSqqE6KHyA8AcvENbYsYMTb3+X3Jj2RWLWFAKuYb3sySC/jzDfJcfeng9UQ9zvTu X-Received: by 2002:a62:ad1:: with SMTP id 78-v6mr18974433pfk.57.1533596263772; Mon, 06 Aug 2018 15:57:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596263; cv=none; d=google.com; s=arc-20160816; b=JCsYDnyw8nXPNeK1G2fssq2KEvQ6w/lRpKNHZgpArgM+2kfsycGGxu1Oor0Xd6F5i1 UReKoeA9pCw9MQcNIKUoJcQG+qHz3minFcKAuWhS0zl1P3569dMB457ZF0/Gm0Vz8JR/ ptOdstdZ5eM/rmuUc7Tw1TsKBOpdMz8GOf9ntGi3wFGYpclctmCwmiBs6QDQ8hKdIP2h sAc3dV4xoKpqjI/ZCj7bxQsKISGq1V4kxLgs5RxlFVz9KkWRBeNGVGkrGnKhWsgsM0JP F33xe6olee4lM5SmxZF7acypYkhDAnirxTKuQAooituMDY43bPEg86IZT+Z3Q7wPWQY3 sVeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=gmwpmXyZUohVoyyxI1JO33lrNItXiaK1JBGw5ZCD4Fs=; b=tgNdgBYdXFAJmiGbi2iGfhVTrrzGldy8QBsaiolXgi7aufvpfcdVXvH6XpKl0UfTbJ q/uEmSikfyRxjB4JfPE+h3KrCkOSxDwn1Kxa87fA17/0wFyzf92rKvlX7uIikSMzM90R ywIeIgoSoJlDN2QBItdNuicUySXfI08fICkNXxWMPDXQh3cVvF6JbznHau2jtwun5X79 +EiinNPVXEPqW3OWUR+o2l+pdWIqcFafTziGWbJFBHSzQrr6+0F93ORf5fiM79QswAl3 IOpJntWI+nxHLl2Qj/Hth6GlvA/26Bx8qdae1MkkCic2ijjSUfYjbfMIwj/a0+7ydHuK tP9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qU1IOKr2; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id h89-v6si10702609pld.517.2018.08.06.15.57.43; Mon, 06 Aug 2018 15:57:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qU1IOKr2; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id B0F3978ABA; Mon, 6 Aug 2018 22:57:41 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f43.google.com (mail-pl0-f43.google.com [209.85.160.43]) by mail.openembedded.org (Postfix) with ESMTP id ACE7378A40 for ; Mon, 6 Aug 2018 22:57:24 +0000 (UTC) Received: by mail-pl0-f43.google.com with SMTP id e11-v6so6252324plb.3 for ; Mon, 06 Aug 2018 15:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wr9gWUxko6uLq01v5vr8aAhpdiwKJ70Cm/0L92KVg0o=; b=qU1IOKr2IDCc8eOi9CodZg8CXg+rzPszfAGbtDx6J/M61aTYL2e6vbD4tnESDCRzOp dZREiKwCZNTMc3iDtlTi5LgCBXj949dRsEIwC5RFoJtlKjMoFgG42TbG8YGsP5vfB/P6 o+GEwd/V4aH9PXCyBrtsW3oSzFNhCfjKQlnNWz7Zu/TrgqqKZjEZlx1wtqkTWqs1Zc5g nvNhFNS4Q43XE3F5i943jzwNColbgR5vfM6JRdeE2WBL1Fc4x0fJsc0/oXNiz7+FrY1W ScSeZIlyy8InsiECHCS91PXHmQ7qrVX4gL2adahu9qL/xCq5Mpvk37ytvcVyb8Gx4go6 Zg/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wr9gWUxko6uLq01v5vr8aAhpdiwKJ70Cm/0L92KVg0o=; b=ANhaWwnU7V8eSQrYgF7a5sDLWbUUgY8gKCvAyZ/fr5XF3LiyZwSVgacgQwim2+DsHZ vrDBxnSb0ch68B1ZyUGMtp6ZQWXJc2ZAd+kn9XpxAF2Y9YumxFSHggLOk4VmEsexIpQs vQ/ePxy8N4M9Xhsy3trZCyHPhtBFM0qDaeYQ6uZ/d9a9c068SfPLELQ50ceSyxo747ae Uou7MzS/mqFni88yv7OP7YUCEoA8nVu3tjWR0rHvhP0hUPSrbD37Bni1gM7IiQgkkza9 MdQSPqLHWYlFD497CTElxaF4NCTQXAMrb/I1DcLrg5BDpw2LcEnOHr+xa8+Wehcav4LO GlmQ== X-Gm-Message-State: AOUpUlH62lihUH8xw2pV11z5vvVuMnk3F0pmqBJw4UfH5d00VKblefyq wgfI+mPxDQM0M+5P1TkTTW4ywsMz X-Received: by 2002:a17:902:3a5:: with SMTP id d34-v6mr15358498pld.98.1533596245351; Mon, 06 Aug 2018 15:57:25 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:24 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:56:59 -0700 Message-Id: X-Mailer: git-send-email 2.18.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [OE-core] [PATCH 02/18] systemd: Detect if statx struct is defined in sys/stat.h X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Fixed build with glibc 2.28+ Signed-off-by: Khem Raj --- ...-whether-struct-statx-is-defined-in-.patch | 109 ++++++++++++++++++ meta/recipes-core/systemd/systemd_239.bb | 1 + 2 files changed, 110 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0022-build-sys-Detect-whether-struct-statx-is-defined-in-.patch diff --git a/meta/recipes-core/systemd/systemd/0022-build-sys-Detect-whether-struct-statx-is-defined-in-.patch b/meta/recipes-core/systemd/systemd/0022-build-sys-Detect-whether-struct-statx-is-defined-in-.patch new file mode 100644 index 0000000000..962463f0b8 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0022-build-sys-Detect-whether-struct-statx-is-defined-in-.patch @@ -0,0 +1,109 @@ +From 75720bff62a84896e9a0654afc7cf9408cf89a38 Mon Sep 17 00:00:00 2001 +From: Filipe Brandenburger +Date: Sun, 15 Jul 2018 22:43:35 -0700 +Subject: [PATCH] build-sys: Detect whether struct statx is defined in + sys/stat.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Starting with glibc 2.27.9000-36.fc29, include file sys/stat.h will have a +definition for struct statx, in which case include file linux/stat.h should be +avoided, in order to prevent a duplicate definition. + + In file included from ../src/basic/missing.h:18, + from ../src/basic/util.h:28, + from ../src/basic/hashmap.h:10, + from ../src/shared/bus-util.h:12, + from ../src/libsystemd/sd-bus/bus-creds.c:11: + /usr/include/linux/stat.h:99:8: error: redefinition of ‘struct statx’ + struct statx { + ^~~~~ + In file included from /usr/include/sys/stat.h:446, + from ../src/basic/util.h:19, + from ../src/basic/hashmap.h:10, + from ../src/shared/bus-util.h:12, + from ../src/libsystemd/sd-bus/bus-creds.c:11: + /usr/include/bits/statx.h:36:8: note: originally defined here + struct statx + ^~~~~ + +Extend our meson.build to look for struct statx when only sys/stat.h is +included and, in that case, do not include linux/stat.h anymore. + +Tested that systemd builds correctly when using a glibc version that includes a +definition for struct statx. + +glibc Fedora RPM update: +https://src.fedoraproject.org/rpms/glibc/c/28cb5d31fc1e5887912283c889689c47076278ae + +glibc upstream commit: +https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=fd70af45528d59a00eb3190ef6706cb299488fcd +--- + +Upstream-Status: Pending +Signed-off-by: Khem Raj + + meson.build | 5 +++++ + src/basic/missing.h | 5 ++++- + src/basic/xattr-util.c | 1 - + 3 files changed, 9 insertions(+), 2 deletions(-) + +Index: git/meson.build +=================================================================== +--- git.orig/meson.build ++++ git/meson.build +@@ -432,6 +432,7 @@ decl_headers = ''' + #include + ''' + # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail ++# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time + + foreach decl : ['char16_t', + 'char32_t', +@@ -446,6 +447,10 @@ foreach decl : ['char16_t', + conf.set10('HAVE_' + decl.underscorify().to_upper(), have) + endforeach + ++conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : ''' ++#include ++''', args : '-D_GNU_SOURCE') > 0) ++ + foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'], + ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'], + ['IFLA_VRF_TABLE', 'linux/if_link.h'], +Index: git/src/basic/missing.h +=================================================================== +--- git.orig/src/basic/missing.h ++++ git/src/basic/missing.h +@@ -15,7 +15,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -25,6 +24,10 @@ + #include + #include + ++#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H ++#include ++#endif ++ + #if HAVE_AUDIT + #include + #endif +Index: git/src/basic/xattr-util.c +=================================================================== +--- git.orig/src/basic/xattr-util.c ++++ git/src/basic/xattr-util.c +@@ -2,7 +2,6 @@ + + #include + #include +-#include + #include + #include + #include diff --git a/meta/recipes-core/systemd/systemd_239.bb b/meta/recipes-core/systemd/systemd_239.bb index 001a363444..67f6117a2a 100644 --- a/meta/recipes-core/systemd/systemd_239.bb +++ b/meta/recipes-core/systemd/systemd_239.bb @@ -28,6 +28,7 @@ SRC_URI += "file://touchscreen.rules \ file://0009-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch \ file://0001-login-use-parse_uid-when-unmounting-user-runtime-dir.patch \ file://0001-sd-bus-make-BUS_DEFAULT_TIMEOUT-configurable.patch \ + file://0022-build-sys-Detect-whether-struct-statx-is-defined-in-.patch \ " SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" From patchwork Mon Aug 6 22:57:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143530 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3806448ljj; Mon, 6 Aug 2018 15:57:48 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdIcQqi2QZr9BRx0JYvCavonDRlvK43CJ3R53hHwSXa1H9U93rFeN1o0lSVGqN6UkuU/RXe X-Received: by 2002:a17:902:e088:: with SMTP id cb8-v6mr15584656plb.189.1533596268781; Mon, 06 Aug 2018 15:57:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596268; cv=none; d=google.com; s=arc-20160816; b=dwKvdj1Ivy75Es9QdnfVL2EgaGEe7kCpSWSLBDCw1bH4h/jSo5knnjimscUkYRh1R0 qJuXa/7oY0nq+8bCjieffFDyOHNTyJtTFvby8Op4vgzlpdqj3/0mR9CP5yfn3e1zqgD4 kVBq2PrD7oFCSsZMMPFtTSr+nSYxCsPvvFbLwpbHQArhp1RHJaNxDyNy4WU9GDKrq+Wr SmApUdc6qG7K/gIulmINsIjXuZyZjiLHSlTVry+JdUmsWBoPFFquOhDKNO+MnLuUtiDm RRYwS3tsE0+dvBIWBx840xLKFLp2ctXwON1LnC9T3H6IcO38s2K/gMQ6W/R2gdCOGfeQ TMlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=gxXWNv6ciLfaDwjwhrYSY0bUKJOX51bbUe0eBYoksdo=; b=E4xcPRwhxIj4VlseuCgeBHZdaX7aN0iBGMWXF9IoEdtkFQt0jBEQBI10kj3/965tTF TKCs5BOfWhMSYmbE3TNhes0LOqCboWyPRDJkNv4o9saRW+st+xCbBaGjZRbcUwnws67j 4ioKOi8VVlf5g+eH+uxpYKche4yiucXi2tx5uNuMFpS2XiH2jh7ozbJ31jxNO31VSzum 2h98BOuUU074uwB+0d6D5U+G0A7Si5oDpZTHVdhPEeCGJZdEMjWdyexXAD31UF/y9P7P tebdMoqd9iPyum6mDb1y3vsCvFwEBLLq7qzuETgOQbqvWVeqsPXC/5C6je5cXLAzKNnv h2gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=DtSgvGqt; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id bd3-v6si10979245plb.155.2018.08.06.15.57.48; Mon, 06 Aug 2018 15:57:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=DtSgvGqt; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1EC2378BF3; Mon, 6 Aug 2018 22:57:43 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by mail.openembedded.org (Postfix) with ESMTP id 4F52378A40 for ; Mon, 6 Aug 2018 22:57:25 +0000 (UTC) Received: by mail-pl0-f66.google.com with SMTP id s17-v6so6240547plp.7 for ; Mon, 06 Aug 2018 15:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BG70gfLAQXd8cJZ12vh01J1F9LLOMlU7cDUKM+Gihwk=; b=DtSgvGqtjEzuNFOTzMIKzCJ4Yv12PNEu7st23owwXqzLhhdEG+WakbQWXQNydVIjvf E04sLYWT1AvLe41UpfTVJ1YNL5Tst5DTj+m2vx2u/OYlkAAzfgmLPM5exCjqBMW1geGe hrTazy6cK2UwVgpMT+A8bc9pc0rty1qXt3aA03OF40zFR8egYO7OSOyhZ49gpS78pSto BHFU8URHrZL2lydl4PiEi/G+j9WWto3Od3uE4FeJk+klq7lwJeo/uhZ4mShDz/sQyG70 Lub5NDsouPVcEQ19QZzgNsrj7hyL1bIq9T1lKOc6IveFsg5AkD+vx9Zyox01mOOmJT1f asrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BG70gfLAQXd8cJZ12vh01J1F9LLOMlU7cDUKM+Gihwk=; b=eGVFqUK6zTJ96dTctqoSitgGF/gKinhVdc10bFU6nfqndbEmhfcpX3M1lST+xAK08W SgSiWwP6pmg3npEKITYDZAar48ptPZIXGYcuHpUHLhElYZFCLVw28zl1/cdjA8W19lN8 dzFvqk8WXzsfw1HCf3ukD/0hB9aZts5UcBjNgNn+WAWQ0ikEsQMi0w9L87K5VxHL9FTx zIAHJSaNDFXUY4HH67jekej2svP66kL8CqrhGNrXiK6mJ3Azu3lcuIHQCsr4Vc/04FGt GID1CCb5yj3aa43KAcC6co2rbjiV8iNNrtAYTcaNs7udUfPmQh2zglrpHBcRK43rqzoE fROA== X-Gm-Message-State: AOUpUlEDlU4TSpcrvgolhfHRi4KNIhM7TdRFze4vYzmMyzs6xdtYAlgB JrnDh4nH0KChN473nOaQjdMKFfUn X-Received: by 2002:a17:902:e28b:: with SMTP id cf11-v6mr15737737plb.86.1533596246080; Mon, 06 Aug 2018 15:57:26 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:25 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:00 -0700 Message-Id: <565404454e982159ac8e042fcdee9eed6a208d36.1533595822.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [OE-core] [PATCH 03/18] m4: Workaround gnulib's fseeko.c implementation X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org exposed by glibc 2.28 for details see https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html Signed-off-by: Khem Raj --- meta/recipes-devtools/m4/m4-1.4.18.inc | 1 + .../m4-1.4.18-glibc-change-work-around.patch | 129 ++++++++++++++++++ 2 files changed, 130 insertions(+) create mode 100644 meta/recipes-devtools/m4/m4/m4-1.4.18-glibc-change-work-around.patch -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/m4/m4-1.4.18.inc b/meta/recipes-devtools/m4/m4-1.4.18.inc index ee8bee446b..a6cef6f328 100644 --- a/meta/recipes-devtools/m4/m4-1.4.18.inc +++ b/meta/recipes-devtools/m4/m4-1.4.18.inc @@ -9,6 +9,7 @@ inherit autotools texinfo SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \ file://ac_config_links.patch \ file://remove-gets.patch \ + file://m4-1.4.18-glibc-change-work-around.patch \ " SRC_URI_append_class-target = " file://0001-Unset-need_charset_alias-when-building-for-musl.patch" diff --git a/meta/recipes-devtools/m4/m4/m4-1.4.18-glibc-change-work-around.patch b/meta/recipes-devtools/m4/m4/m4-1.4.18-glibc-change-work-around.patch new file mode 100644 index 0000000000..72e7ae2080 --- /dev/null +++ b/meta/recipes-devtools/m4/m4/m4-1.4.18-glibc-change-work-around.patch @@ -0,0 +1,129 @@ +update for glibc libio.h removal in 2.28+ + +see +https://src.fedoraproject.org/rpms/m4/c/814d592134fad36df757f9a61422d164ea2c6c9b?branch=master + +Upstream-Status: Pending +Signed-off-by: Khem Raj +Index: m4-1.4.18/lib/fflush.c +=================================================================== +--- m4-1.4.18.orig/lib/fflush.c ++++ m4-1.4.18/lib/fflush.c +@@ -33,7 +33,7 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +Index: m4-1.4.18/lib/fpending.c +=================================================================== +--- m4-1.4.18.orig/lib/fpending.c ++++ m4-1.4.18/lib/fpending.c +@@ -32,7 +32,7 @@ __fpending (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return fp->_IO_write_ptr - fp->_IO_write_base; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ +Index: m4-1.4.18/lib/fpurge.c +=================================================================== +--- m4-1.4.18.orig/lib/fpurge.c ++++ m4-1.4.18/lib/fpurge.c +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +Index: m4-1.4.18/lib/freadahead.c +=================================================================== +--- m4-1.4.18.orig/lib/freadahead.c ++++ m4-1.4.18/lib/freadahead.c +@@ -25,7 +25,7 @@ + size_t + freadahead (FILE *fp) + { +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return 0; + return (fp->_IO_read_end - fp->_IO_read_ptr) +Index: m4-1.4.18/lib/freading.c +=================================================================== +--- m4-1.4.18.orig/lib/freading.c ++++ m4-1.4.18/lib/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +Index: m4-1.4.18/lib/fseeko.c +=================================================================== +--- m4-1.4.18.orig/lib/fseeko.c ++++ m4-1.4.18/lib/fseeko.c +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +Index: m4-1.4.18/lib/stdio-impl.h +=================================================================== +--- m4-1.4.18.orig/lib/stdio-impl.h ++++ m4-1.4.18/lib/stdio-impl.h +@@ -18,6 +18,12 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + From patchwork Mon Aug 6 22:57:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143532 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3806606ljj; Mon, 6 Aug 2018 15:58:07 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdLGGGswz8Je54n1DgsStQemZeAd25HLfA+fg5F1ucebpcM9ljf4aN+VWw9JV7AxnTVX/3g X-Received: by 2002:a17:902:7d8f:: with SMTP id a15-v6mr15699181plm.332.1533596286947; Mon, 06 Aug 2018 15:58:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596286; cv=none; d=google.com; s=arc-20160816; b=ZlkzPXOs8gBeUry2IxkLQqwYqi258as3zm0IF8KJ1m6bezLzjZMEu2M8ctV1OMpcqP KamK4RYaUpsbZWGTQUWRZI7319J6KJyXmLYyvoy/W6bRqrc92l28QC9QBq5JSZzxZVZh ayWBnBYa8mwzK3z7atWaLG+Zotk21nwD6Vw6hIHOqVI3lN1DSeCXaH06bbPjLpwxYrlX C64YL4Fgl4veFwZ8YM7D0X1U4JUQdnk3dGuabkGrEb9Tgn8ZWN0P6qMV+euq9M43zskz UxaC5LN+KXK4OeD49g5XVcRsTSKJDa8ZaGbCDoP6Hryt/aBtY+4NWZAdxnYbAQ9QgmN7 E6tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=uRSyHq05uUt5If61/oMZVHrwi/CdFsc0+t1hhQMSDU0=; b=MHD+RuwlVUv8TdwHW7AIn29z7bfkeaOrPOyISFMJMTXkLqE/LCYld2qB07LXE57DAN k2slTeIk99DUKhgS8XtYTmrK6yMDPgsMdFncNXJURv1iDWL80kkOA0IGKJejxaA+Ftky u7pK3++LoGk6+Ut2tDTdXrtnp76F2QFNlx6zY3YdcgF041gq/ksf3Dt1NkAQENoL1pkd oWD/2+BktS7uD10NFbTjJjoE/03FRce5pWmi7oMz77CcBCpr/OKyM/7bZzTPuNvbdoMV ce+g7OsT5kDVl2ie3RW2scPHwg8VCOnR8K+Yx/SJP1j/hiPTW0i3ql6tU2kABl1UVVkY 0Pbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=S2KrQXLd; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id u20-v6si10104340pgj.443.2018.08.06.15.58.06; Mon, 06 Aug 2018 15:58:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=S2KrQXLd; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id D883B78C01; Mon, 6 Aug 2018 22:57:45 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mail.openembedded.org (Postfix) with ESMTP id 135A478ABA for ; Mon, 6 Aug 2018 22:57:27 +0000 (UTC) Received: by mail-pg1-f169.google.com with SMTP id z8-v6so6859644pgu.8 for ; Mon, 06 Aug 2018 15:57:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NdVgus2w9BStKdpZY32wDMII2P1dof+dvDoWVm9jIFQ=; b=S2KrQXLdz5MoxsWOc0gDNg2q0X1hAePqIgEXK4jNQLWK1synQYGCDWXzqnDtmZuCX5 vN7vk95gX07dsEJ6mEVDWS9q1nyDUffi8x3IXxPkzwsweNUDEFY7Zszn5HMknao5lLZk QRH/UdQ9o+rtXoacVr3N8m2atl7Wtpnr9x9Q7yH7iy1aS/nc1AxEGVvS0bd0MR/IsKR8 O1NvGU1XTQNu+9uqkBZPmu1tN0hly/KkAUw4MbUxD5xD8KUIM9Jh/qU1UkCOAYOZKl0z xU2Un990/meoa1h9EbbWNaJaBt368W10RaA7GfF69h0FW+mOobZGf02Op4xqV0UmD5il 4Qwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NdVgus2w9BStKdpZY32wDMII2P1dof+dvDoWVm9jIFQ=; b=lH0vSMf7WFIBcS/aUsKoHsnjt7xjNNWQ7D++V0sOo9V6Xq0kRDv33D0UxGiUU2saI1 lpXWxM8iX9YxIIeDPGpIMPREZdrT4BfcxGBhq988h6K+nIN1uFZLYGu4Waw0pq+JsGpS gLBb2MKJwHRP6iWf2Lr8COxJPWJlwGsUWZu+jIzPUldixdv2Ygu/8xM/EdlI9yhkef4p zP3cQFfHdQ7PdZF4uQICOvnaGGCYbXOBWRl1ygagjxROgQY1kp8RB7djfLHAFSmW4UcE +lfJE7jta1esZSdtwV87uHT9osSfo7gDM4xXshNXNs/7yDAzbrXvUKtjsujap5fg3UXG +vvA== X-Gm-Message-State: AOUpUlGlwfhHN34LgiHf+GXW9OD0giS16/eBoTDl/oKH1mIuRVBpuHd+ M7Be0lyzKyMygRrpU6FStxwDYCqW X-Received: by 2002:a63:ea0c:: with SMTP id c12-v6mr16384465pgi.158.1533596247779; Mon, 06 Aug 2018 15:57:27 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:26 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:01 -0700 Message-Id: <17bf06e859082ab6c1526d377e363c3e46755c76.1533595822.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [OE-core] [PATCH 04/18] findutils: Fix build with glibc 2.28 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Fix foe gnulib bug and makedev header move in glibc 2.25+ Signed-off-by: Khem Raj --- .../findutils-4.6.0-gnulib-fflush.patch | 140 ++++++++++++++++++ .../findutils-4.6.0-gnulib-makedev.patch | 78 ++++++++++ .../findutils/findutils_4.6.0.bb | 2 + 3 files changed, 220 insertions(+) create mode 100644 meta/recipes-extended/findutils/findutils/findutils-4.6.0-gnulib-fflush.patch create mode 100644 meta/recipes-extended/findutils/findutils/findutils-4.6.0-gnulib-makedev.patch diff --git a/meta/recipes-extended/findutils/findutils/findutils-4.6.0-gnulib-fflush.patch b/meta/recipes-extended/findutils/findutils/findutils-4.6.0-gnulib-fflush.patch new file mode 100644 index 0000000000..d13e8ed3cf --- /dev/null +++ b/meta/recipes-extended/findutils/findutils/findutils-4.6.0-gnulib-fflush.patch @@ -0,0 +1,140 @@ +From 80cdfba079627e15129a926a133825b961d41e36 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Mon, 5 Mar 2018 10:56:29 -0800 +Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Daniel P. Berrangé in: +https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html +* lib/fflush.c (clear_ungetc_buffer_preserving_position) +(disable_seek_optimization, rpl_fflush): +* lib/fpurge.c (fpurge): +* lib/freadahead.c (freadahead): +* lib/freading.c (freading): +* lib/fseeko.c (fseeko): +* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: +Define if not already defined. + +Upstream-commit: 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e +Signed-off-by: Kamil Dudka +Upstream-Status: Backport [4af4a4a71827c0bc5e0ec67af23edef4f15cee8e] +--- + gl/lib/fflush.c | 6 +++--- + gl/lib/fpurge.c | 2 +- + gl/lib/freadahead.c | 2 +- + gl/lib/freading.c | 2 +- + gl/lib/fseeko.c | 4 ++-- + gl/lib/stdio-impl.h | 6 ++++++ + 6 files changed, 14 insertions(+), 8 deletions(-) + +Index: findutils-4.6.0/gl/lib/fflush.c +=================================================================== +--- findutils-4.6.0.orig/gl/lib/fflush.c ++++ findutils-4.6.0/gl/lib/fflush.c +@@ -33,7 +33,7 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +Index: findutils-4.6.0/gl/lib/fpurge.c +=================================================================== +--- findutils-4.6.0.orig/gl/lib/fpurge.c ++++ findutils-4.6.0/gl/lib/fpurge.c +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +Index: findutils-4.6.0/gl/lib/freadahead.c +=================================================================== +--- findutils-4.6.0.orig/gl/lib/freadahead.c ++++ findutils-4.6.0/gl/lib/freadahead.c +@@ -25,7 +25,7 @@ + size_t + freadahead (FILE *fp) + { +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return 0; + return (fp->_IO_read_end - fp->_IO_read_ptr) +Index: findutils-4.6.0/gl/lib/freading.c +=================================================================== +--- findutils-4.6.0.orig/gl/lib/freading.c ++++ findutils-4.6.0/gl/lib/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +Index: findutils-4.6.0/gl/lib/fseeko.c +=================================================================== +--- findutils-4.6.0.orig/gl/lib/fseeko.c ++++ findutils-4.6.0/gl/lib/fseeko.c +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +Index: findutils-4.6.0/gl/lib/stdio-impl.h +=================================================================== +--- findutils-4.6.0.orig/gl/lib/stdio-impl.h ++++ findutils-4.6.0/gl/lib/stdio-impl.h +@@ -18,6 +18,12 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + diff --git a/meta/recipes-extended/findutils/findutils/findutils-4.6.0-gnulib-makedev.patch b/meta/recipes-extended/findutils/findutils/findutils-4.6.0-gnulib-makedev.patch new file mode 100644 index 0000000000..0fb3953cf3 --- /dev/null +++ b/meta/recipes-extended/findutils/findutils/findutils-4.6.0-gnulib-makedev.patch @@ -0,0 +1,78 @@ +From 80628047a6cc83f82e0c410a82b8f7facd9d50f2 Mon Sep 17 00:00:00 2001 +From: Eric Blake +Date: Wed, 14 Sep 2016 19:21:42 -0500 +Subject: [PATCH] mountlist: include sysmacros.h for glibc + +On Fedora rawhide (glibc 2.25), './gnulib-tool --test mountlist' +reports: +../../gllib/mountlist.c: In function 'read_file_system_list': +../../gllib/mountlist.c:534:13: warning: '__makedev_from_sys_types' is deprecated: + In the GNU C Library, `makedev' is defined by . + For historical compatibility, it is currently defined by + as well, but we plan to remove this soon. + To use `makedev', include directly. + If you did not intend to use a system-defined macro `makedev', + you should #undef it after including . + [-Wdeprecated-declarations] + me->me_dev = makedev (devmaj, devmin); + ^~ +In file included from /usr/include/features.h:397:0, + from /usr/include/sys/types.h:25, + from ./sys/types.h:28, + from ../../gllib/mountlist.h:23, + from ../../gllib/mountlist.c:20: +/usr/include/sys/sysmacros.h:89:1: note: declared here + __SYSMACROS_DEFINE_MAKEDEV (__SYSMACROS_FST_IMPL_TEMPL) + ^ + +Fix it by including the right headers. We also need a fix to +autoconf's AC_HEADER_MAJOR, but that's a separate patch. + +* m4/mountlist.m4 (gl_PREREQ_MOUTLIST_EXTRA): Include +AC_HEADER_MAJOR. +* lib/mountlist.c (includes): Use correct headers. + +Signed-off-by: Eric Blake + +Upstream-commit: 4da63c5881f60f71999a943612da9112232b9161 +Signed-off-by: Kamil Dudka +Upstream-Status: Backport [4da63c5881f60f71999a943612da9112232b9161] +--- + gl/lib/mountlist.c | 6 ++++++ + gl/m4/mountlist.m4 | 3 ++- + 2 files changed, 8 insertions(+), 1 deletion(-) + +Index: findutils-4.6.0/gl/lib/mountlist.c +=================================================================== +--- findutils-4.6.0.orig/gl/lib/mountlist.c ++++ findutils-4.6.0/gl/lib/mountlist.c +@@ -37,6 +37,12 @@ + # include + #endif + ++#if MAJOR_IN_MKDEV ++# include ++#elif MAJOR_IN_SYSMACROS ++# include ++#endif ++ + #if defined MOUNTED_GETFSSTAT /* OSF_1 and Darwin1.3.x */ + # if HAVE_SYS_UCRED_H + # include /* needed on OSF V4.0 for definition of NGROUPS, +Index: findutils-4.6.0/gl/m4/mountlist.m4 +=================================================================== +--- findutils-4.6.0.orig/gl/m4/mountlist.m4 ++++ findutils-4.6.0/gl/m4/mountlist.m4 +@@ -1,4 +1,4 @@ +-# serial 11 ++# serial 12 + dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -15,5 +15,6 @@ AC_DEFUN([gl_PREREQ_MOUNTLIST_EXTRA], + [ + dnl Note gl_LIST_MOUNTED_FILE_SYSTEMS checks for mntent.h, not sys/mntent.h. + AC_CHECK_HEADERS([sys/mntent.h]) ++ AC_HEADER_MAJOR()dnl for use of makedev () + gl_FSTYPENAME + ]) diff --git a/meta/recipes-extended/findutils/findutils_4.6.0.bb b/meta/recipes-extended/findutils/findutils_4.6.0.bb index db03252f54..5e4ca94868 100644 --- a/meta/recipes-extended/findutils/findutils_4.6.0.bb +++ b/meta/recipes-extended/findutils/findutils_4.6.0.bb @@ -8,6 +8,8 @@ DEPENDS = "bison-native" SRC_URI += "file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch \ + file://findutils-4.6.0-gnulib-fflush.patch \ + file://findutils-4.6.0-gnulib-makedev.patch \ " SRC_URI[md5sum] = "9936aa8009438ce185bea2694a997fc1" From patchwork Mon Aug 6 22:57:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143533 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3806666ljj; Mon, 6 Aug 2018 15:58:13 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfsjrjwn0c+ZJsm2sNM+w2KEIfiPpyQAaIWaw1/RTHTx7OMeRndLO40fyXNog35uFkvTgu1 X-Received: by 2002:a62:6948:: with SMTP id e69-v6mr18915579pfc.166.1533596293104; Mon, 06 Aug 2018 15:58:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596293; cv=none; d=google.com; s=arc-20160816; b=q0vPPtyTFUOei7+dM8MVSzBf+vuK8HQk76mFCEkCJf0x0rAeqH1GcBjvs1MIuoyqNM qNoyhm/dqXS/CphqEt2IsqKMgJDJHJ/4VM3Ni5ahufA0k+0aAfIY/1Gi0jXIRqjVYkmL 6jE3wQPlOjD5PtiqUlViGni/C75FL/MzZ0qu7WIUaIJiLpDo/1zp7yR7lY4sdwX/WUfu SbtNaCxoqBDx1CSqVa22wklOQfaHm9d76vaci48oVo5/39+GbyWHkhV2cQwo6G0xRX2g e36LIUSU4Rkiymi+/qnS173f3hLZS1ElgKD2FCd9KrOI3iMp8g5uNf4D/idL3eoxWqhm uasw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=MQStxJktyrs7EIBnfzXW3XUvt5uQqmptPPsAGcFDMr4=; b=buO6++Wu7+WaOBwx9MPa+yEqZyzvK0DVG/cjBJtNOwOyvYsG5nusSKh3DUN/fFW3vH BvIwc+DLfyzrQqLpdo6CEb7iCbeKpF0nag8oXY5OHNW/u5wxWC3ku8MfquQ7p6FnWlcc fmrJJV8RXKY0uZqmKIB8wWmwg+6AVr2YBKFFf8iT3zlg2I49N1jRgBZ8zGpziDFr3cEo wdJQuJBn+lZwL5asryUrtQ8/u8yL4SU9QrwX9Wt8qDzc5bhOEceyemp+Uvr1ocoYTTB7 8OrVxHwQhpb3tij9HHzqY5cIURHazEd1JRZZsX8r9lmxRtVem88lAynDQYniZLfbu+TV GwEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NBTZ54Fp; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id j21-v6si13467039pgg.303.2018.08.06.15.58.12; Mon, 06 Aug 2018 15:58:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NBTZ54Fp; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id EA7BF78C04; Mon, 6 Aug 2018 22:57:46 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by mail.openembedded.org (Postfix) with ESMTP id A0B3D745BF for ; Mon, 6 Aug 2018 22:57:28 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id k21-v6so7538378pff.11 for ; Mon, 06 Aug 2018 15:57:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yYFLOADz9wzI8IP4a4yyvcgpux47eJe1/mmivD/KHqg=; b=NBTZ54Fp+QOGR+ipO9TqzPlTeO0UavMzmgr9msyU25ZhgOPVR9ksxazn2a5ocjo2Yv iIZgO5EIMkW2hfnZGvQONrLF+bXPSOtMnTD4TS7zO+2ZfB76FUR2wt7zC+ervHywPtz6 QyxjOFys/noNV3XE0bf+0R3PYHYpLsj25t2bAPrmT0RV3Tn0BXh1wpAmeU/Vqu3fFwIy /t7+y5L9l50EFeRK2x/iww8dXIrUw7LTbKXIl8cd/uVjiYSriID1MFzwOSEAeWJLLzFj MbwxL1ISsbZmQuht7TLilBbKR8kIOUj/3oOjmZy7qMhOKmgTpj1gfOfjELsNSKb9SyaX NpUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yYFLOADz9wzI8IP4a4yyvcgpux47eJe1/mmivD/KHqg=; b=M7gEpumqWOznGgzjL3vnvSbOsQoGpAklaUT0CLibBUgUf3gmMaohIIbBljssAC0tFF MIasZmVGTeShA6xhHTC8kr68QTSwDHbWOnHWOmSzp3Pjh0b6TqZMnAuGSCSafalqYj2e EyZKCCcA6bgpLzU6UTpefeg+jy1PJBj7DEmeUhF1E96XDaJvV9htoZx1WJV8TS+fr3Db 01jHgqEeTmRmWDMdO2Y4IuMq0YhDY6xBsvVMyj7hrEAtmu5oZj7t6icvJbkZZjmkkzUm d6EBFcEwSEXDKUUVPgWDcC9DL+YzU6Xi4r1ZO/H/EwBD8A9fvmPagKYkP6yghrSiA+iB dkLw== X-Gm-Message-State: AOUpUlFhSiY7qMd6Hi295GLvjkjW+xjftqXxdpkRVDYcs5Q8Ouu/2f/C L1hZNwzIZ+2jtE41UFOr9rAhRDx7 X-Received: by 2002:a65:6551:: with SMTP id a17-v6mr16286798pgw.132.1533596249409; Mon, 06 Aug 2018 15:57:29 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:28 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:02 -0700 Message-Id: <686091cb772584e50fb5a42b88dff3fc342e7b8f.1533595822.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [OE-core] [PATCH 05/18] bootchart2: Update to master-tip X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org This has several fixes to get it building with glibc 2.28+ remove backported patch which is not needed now Signed-off-by: Khem Raj --- ...ssing-default-value-for-BOOTLOG_DEST.patch | 30 ------------------- .../bootchart2/bootchart2_0.14.8.bb | 4 +-- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 meta/recipes-devtools/bootchart2/bootchart2/0001-Fixed-Missing-default-value-for-BOOTLOG_DEST.patch -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/bootchart2/bootchart2/0001-Fixed-Missing-default-value-for-BOOTLOG_DEST.patch b/meta/recipes-devtools/bootchart2/bootchart2/0001-Fixed-Missing-default-value-for-BOOTLOG_DEST.patch deleted file mode 100644 index 118814a807..0000000000 --- a/meta/recipes-devtools/bootchart2/bootchart2/0001-Fixed-Missing-default-value-for-BOOTLOG_DEST.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2225ab2038bfe50f16f972e39d89bcd0bd7767f5 Mon Sep 17 00:00:00 2001 -From: Steffen Pankratz -Date: Tue, 9 Feb 2016 13:49:42 +0100 -Subject: [PATCH] Fixed: Missing default value for BOOTLOG_DEST - -Upstream-Status: Backport - -BUILDLOG_DEST seems to be a typo or mix-up which was introduced with 281d1df80884bf2969c509ec60ee8a6593524fe8 - -Signed-off-by: Peter Liu ---- - bootchartd.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bootchartd.in b/bootchartd.in -index f58ab9e..30af677 100755 ---- a/bootchartd.in -+++ b/bootchartd.in -@@ -37,7 +37,7 @@ PATH="/sbin:/bin:/usr/sbin:/usr/bin:$PATH" - - # Defaults, in case we can't find our configuration - SAMPLE_HZ=50 --BUILDLOG_DEST=/var/log/bootchart.tgz -+BOOTLOG_DEST=/var/log/bootchart.tgz - AUTO_RENDER="no" - AUTO_RENDER_DIR="/var/log" - AUTO_RENDER_FORMAT="png" --- -1.9.1 - diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb index b3c889b0a8..396d0ec0a1 100644 --- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb +++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb @@ -92,12 +92,12 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+(\.\d+)*)" SRC_URI = "git://github.com/xrmx/bootchart.git \ file://bootchartd_stop.sh \ - file://0001-Fixed-Missing-default-value-for-BOOTLOG_DEST.patch \ file://0001-collector-Allocate-space-on-heap-for-chunks.patch \ " S = "${WORKDIR}/git" -SRCREV = "48e0071048564c6af75ab969e842d6dec808da09" +SRCREV = "331ada031f1d65f6d934d918f896e1c708c64bf7" +PV .= "+git${SRCPV}" inherit systemd update-rc.d python3native update-alternatives From patchwork Mon Aug 6 22:57:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143534 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3806731ljj; Mon, 6 Aug 2018 15:58:18 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcQVgUNBMRognC0Uu97CGjetSpqGtf7tDozQfSDmC+jcEQFe5WbLy97Y4b/sL2/743XJl3z X-Received: by 2002:a17:902:5856:: with SMTP id f22-v6mr15835413plj.266.1533596298688; Mon, 06 Aug 2018 15:58:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596298; cv=none; d=google.com; s=arc-20160816; b=ow5BRLgZTgTmFvhecjSxEPlJkEvoOX+fEBfwMJOe0U6Ek/LrehdrPMrjfgeYdP00iq OODxqQdVQfR+oXSrQDkb5Er4J3Px24WmZsEcHXH4uw5xcEfRSI/JUp8b9pFMyELhg2mZ R7jb+ZQIssBIjgyGtJyX7TT+ZgJsPNf3TZQHEv0YUJRcpHkckuvOGWgFH0uUNp2bTWEm AE8sD3QOJxVWyMHCxa9Z5QfPlC2Y5WpTMHL6X3tfCK/0diGBuKhtg9BmJAt21JruCcFH LZF2xNiC7CfSSWzXldR/sFijV4RZiy4L5GXiUiRuCc9hxmcwho0eEtKs4mPDkaKGKXN+ q2sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=qJ8P0EZs/BDzTt19mPdzlPi/ecrt/59jIPGDWVW4DnU=; b=nNrzplTApCVtEPxkeUrKRW0s4t5sfIQdvaS0fmfNDS2R/tVAqfnSwFXMJXVrEVcoP+ p9Nby7aMz2Gn2dc7Ai0ScIrl2bnzJE1SPlgIYwwbSXOW1g0pZFGaevTbI1CmXmL+KVme qZbCFMyjD1eFn3EeaUIfiBT9qlKsENLS7PDemTo/2ODwSLVRqvlsNu7IIbcRx5qqxNO1 WaBuunrhDcajG53ikI6jRuAIzyXdvHUiqcUVNxFqsXkGM1m21+f1V3ZghCYMZARAq3Y2 oNuVuqfmOpWVxhy94vqIoJjmnExqrk60qAAhjhUdid0sjf/w5J/Wh2hXFql76ZoqzV3l kkXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=XzCDU+FC; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id v84-v6si15970281pfa.103.2018.08.06.15.58.18; Mon, 06 Aug 2018 15:58:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=XzCDU+FC; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1962D78AD6; Mon, 6 Aug 2018 22:57:48 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by mail.openembedded.org (Postfix) with ESMTP id A874A745BF for ; Mon, 6 Aug 2018 22:57:30 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id a11-v6so6862657pgw.6 for ; Mon, 06 Aug 2018 15:57:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P80zQGv64hLsUWXwg8MePo1LgIVHhFsSZuYLmNw29W0=; b=XzCDU+FCy2JICbrPJ9+PgDfFjk3AJI15sEAN7lCM974Ese65IcWmMu4UAgNRREhmLh RQ2hQzeUbvh2EUH+EzW+jHJvnSw/DNa8qD4zdpjRhp4vKFvJmWvhyn7eXx8jlqKxRZbc Nhp/8Ougea95NeBYPGnR9GgxgExGrNSBHd+LhT4jx42LqOK1LJZWBsfgJx9/xvfAP5G9 ZGsXyCEOb4a/NsInWNJPCvgGfMp0ZBcxsv69+PJhzf+RojBovHmE8PMqKg6r/ANfaBzp IpPWJDZtaYGy5TNbiUr9s5vcU2DD+y0s4usbifXxCZ+03v3+6CSfdGNLYOmoWnUD698l +rFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=P80zQGv64hLsUWXwg8MePo1LgIVHhFsSZuYLmNw29W0=; b=dvMDsmO4+QiO2YVe2pTI0Y96q8hXUXSrHzZWrn3EHFyoFHfgDhwRl6aBaplAF3ckyv 4sGrtLHBd5fJCZvcD9YltDXFDlVIuQudpDV8nrjtRgtnuXDDPPdhoBh1onZJJT+maqdl kAYn5cNhH4G4kQZajXmnMJ/gPWvZZ+vTyhJ4EiUVYtLcPzC4XLB9PtIVNgLz5Y5posJm 8H+H38vAptvdP/bwmgmlEEaAMqRGI/4U0xwsyRBFZaWSvyudVdtqHW1AzJCXb1QAc9Xk jm70pJMM7pIR0gBdIsQx8O1ZnAtOdd5Jy4OoAUOtbSHjWBw7R8vgvsQ40rAVzGBHxSH9 XL7A== X-Gm-Message-State: AOUpUlH0NZtPyxAQeiifeF5hyUufmEEVHTbf3Vy2MNZD8lrup4aP7Agn m63vUVVDqK6+ILdrNGk7QE+godf5 X-Received: by 2002:a63:ca09:: with SMTP id n9-v6mr15889293pgi.287.1533596251199; Mon, 06 Aug 2018 15:57:31 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:29 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:03 -0700 Message-Id: <8a10af62dac20d97cd710e4abc7135272182da8d.1533595822.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [OE-core] [PATCH 06/18] gzip: Fix build with glibc 2.28 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../gzip/gzip-1.9/gnulib.patch | 189 ++++++++++++++++++ meta/recipes-extended/gzip/gzip_1.9.bb | 4 +- 2 files changed, 192 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/gzip/gzip-1.9/gnulib.patch diff --git a/meta/recipes-extended/gzip/gzip-1.9/gnulib.patch b/meta/recipes-extended/gzip/gzip-1.9/gnulib.patch new file mode 100644 index 0000000000..c3cdd72b64 --- /dev/null +++ b/meta/recipes-extended/gzip/gzip-1.9/gnulib.patch @@ -0,0 +1,189 @@ +From 1831628c0630ae96a43586b2a25ca51cbdba3e53 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Mon, 5 Mar 2018 10:56:29 -0800 +Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Daniel P. Berrangé in: +https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html +* lib/fbufmode.c (fbufmode): +* lib/fflush.c (clear_ungetc_buffer_preserving_position) +(disable_seek_optimization, rpl_fflush): +* lib/fpending.c (__fpending): +* lib/fpurge.c (fpurge): +* lib/freadable.c (freadable): +* lib/freadahead.c (freadahead): +* lib/freading.c (freading): +* lib/freadptr.c (freadptr): +* lib/freadseek.c (freadptrinc): +* lib/fseeko.c (fseeko): +* lib/fseterr.c (fseterr): +* lib/fwritable.c (fwritable): +* lib/fwriting.c (fwriting): +Check _IO_EOF_SEEN instead of _IO_ftrylockfile. +* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: +Define if not already defined. +--- + +Upstream-Status: Pending +Signed-off-by: Khem Raj + + ChangeLog | 23 +++++++++++++++++++++++ + lib/fbufmode.c | 2 +- + lib/fflush.c | 6 +++--- + lib/fpending.c | 2 +- + lib/fpurge.c | 2 +- + lib/freadable.c | 2 +- + lib/freadahead.c | 2 +- + lib/freading.c | 2 +- + lib/freadptr.c | 2 +- + lib/freadseek.c | 2 +- + lib/fseeko.c | 4 ++-- + lib/fseterr.c | 2 +- + lib/fwritable.c | 2 +- + lib/fwriting.c | 2 +- + lib/stdio-impl.h | 6 ++++++ + 15 files changed, 45 insertions(+), 16 deletions(-) + +Index: gzip-1.9/ChangeLog +=================================================================== +--- gzip-1.9.orig/ChangeLog ++++ gzip-1.9/ChangeLog +@@ -1,3 +1,26 @@ ++2018-03-05 Paul Eggert ++ ++ fflush: adjust to glibc 2.28 libio.h removal ++ Problem reported by Daniel P. Berrangé in: ++ https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html ++ * lib/fbufmode.c (fbufmode): ++ * lib/fflush.c (clear_ungetc_buffer_preserving_position) ++ (disable_seek_optimization, rpl_fflush): ++ * lib/fpending.c (__fpending): ++ * lib/fpurge.c (fpurge): ++ * lib/freadable.c (freadable): ++ * lib/freadahead.c (freadahead): ++ * lib/freading.c (freading): ++ * lib/freadptr.c (freadptr): ++ * lib/freadseek.c (freadptrinc): ++ * lib/fseeko.c (fseeko): ++ * lib/fseterr.c (fseterr): ++ * lib/fwritable.c (fwritable): ++ * lib/fwriting.c (fwriting): ++ Check _IO_EOF_SEEN instead of _IO_ftrylockfile. ++ * lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: ++ Define if not already defined. ++ + 2018-01-07 Jim Meyering + + version 1.9 +Index: gzip-1.9/lib/fflush.c +=================================================================== +--- gzip-1.9.orig/lib/fflush.c ++++ gzip-1.9/lib/fflush.c +@@ -33,7 +33,7 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +Index: gzip-1.9/lib/fpurge.c +=================================================================== +--- gzip-1.9.orig/lib/fpurge.c ++++ gzip-1.9/lib/fpurge.c +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +Index: gzip-1.9/lib/freading.c +=================================================================== +--- gzip-1.9.orig/lib/freading.c ++++ gzip-1.9/lib/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +Index: gzip-1.9/lib/fseeko.c +=================================================================== +--- gzip-1.9.orig/lib/fseeko.c ++++ gzip-1.9/lib/fseeko.c +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +Index: gzip-1.9/lib/fseterr.c +=================================================================== +--- gzip-1.9.orig/lib/fseterr.c ++++ gzip-1.9/lib/fseterr.c +@@ -29,7 +29,7 @@ fseterr (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +Index: gzip-1.9/lib/stdio-impl.h +=================================================================== +--- gzip-1.9.orig/lib/stdio-impl.h ++++ gzip-1.9/lib/stdio-impl.h +@@ -18,6 +18,12 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + diff --git a/meta/recipes-extended/gzip/gzip_1.9.bb b/meta/recipes-extended/gzip/gzip_1.9.bb index a8eeba1380..19f6586526 100644 --- a/meta/recipes-extended/gzip/gzip_1.9.bb +++ b/meta/recipes-extended/gzip/gzip_1.9.bb @@ -3,7 +3,9 @@ require gzip.inc LICENSE = "GPLv3+" SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ - file://run-ptest" + file://run-ptest \ + file://gnulib.patch \ + " SRC_URI_append_class-target = " file://wrong-path-fix.patch" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ From patchwork Mon Aug 6 22:57:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143535 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3806812ljj; Mon, 6 Aug 2018 15:58:25 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc+EMnkCzKGsA9FoNX6v7Uy8pwYNGcQ1856MU3cnaEA+jyIvfCRU9DXqFJbc6mwd5u3aGKF X-Received: by 2002:a17:902:6501:: with SMTP id b1-v6mr15582367plk.31.1533596305423; Mon, 06 Aug 2018 15:58:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596305; cv=none; d=google.com; s=arc-20160816; b=AAswuXDIRoHuaNHh8Wgi1BNGvyIsRkpyURPiafldcBNRaqvWttwzsSFI6ugLKDwHgR OAAVngdE+eKuGOUvf4SihZe+jYfsTjzGwElfQ9Y6d/V8udEMU5zqOChFBbG1oFkEjnh9 +aHO43y0qYp2fZQ66KFsy25KN00V9GZdAxAFOK0KVmRO+CzFpS5Xz2rfjAUNGtlkX3dL gGcMu/uWKyhVIIBUSjNdyQuJT/HpOJqAg2qcElXia9ZvStrmhzouwgceKhYW/Pcsh8c7 /HRJiJlYpTFkvT7MJDPlHAnaIlCM5B3LGAOeud49sh/7402fvBb51Ft5c3gS1WR/+Ugz /wwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=WjGOAJlFet6H7Lmz+1tewHqCE4kqwnpZOUh7T6IjfWo=; b=bfugrvabP0LAId2Xc2mrjsJphu3w6mfq4j1vPmYlFK60xvUCBHtLzVupWilS/QVDmT F0yAtKyEv+mS2/n8AgVPDLx1sGLmzkjAVCDooBcfZMV466v1a4bvk6/+c9tF7LnBaLKi VP6Y758YSozwyuAvz3tRHNP1OjiNxJrQ34EUL8ckbYppViBJiVm9n7cLCy6jTUdMNwWy 7zB9TIL4lj6AaYKoCcbw5aLEDkwJKSNoXT1oyM44VJs1dnD2hsFXOaR+bc6SdDyCCPms 302FAkQezQQOS1bkNcxml0UUsobu6Jm+BHr0EqTACMFUgnXF3ETSV8Xmr7GpwKOHiija qNOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Mbc95jy1; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a1-v6si13641692pga.639.2018.08.06.15.58.25; Mon, 06 Aug 2018 15:58:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Mbc95jy1; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5F4F178C1F; Mon, 6 Aug 2018 22:57:49 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by mail.openembedded.org (Postfix) with ESMTP id 0C8FA745BF for ; Mon, 6 Aug 2018 22:57:31 +0000 (UTC) Received: by mail-pl0-f65.google.com with SMTP id j8-v6so6225556pll.12 for ; Mon, 06 Aug 2018 15:57:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=miJVhpZn7mpqXvQYQrSoFayAv9wVbUCM7NawS+nmzsc=; b=Mbc95jy1F6VdBml2Zn8ty2BpLmrxy/D28zc+Ixz6TquFGtZdK9YCkBM61OTKlmoFbt Wuna/jiPci71v8Sauhz7SnGNsmwaXSznGfXFBWCT5da60uWWpBTANJ9dIDTQuUV7mfQs RRZD14EgzGQNzS1Xbm0KDm6zpa2aOcGlS2/Ug5HVZ+yBGwZyC3Yrw6LPMlhCfMBwORVq +AkKJAZYDy9JF5y68Za4EQHet6wW0OZJt4qzPIXOMIPSO5LgdkH0ivzwJZVwcxn5BAdS B+mcLHnC/tlwj8wpbewA1DhXm0OeimjjSIbgDuXV/Oo7G410j2ZAnF5bfacCO9scJS1w 4b8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=miJVhpZn7mpqXvQYQrSoFayAv9wVbUCM7NawS+nmzsc=; b=FeXLphsLPtDqFeLq45jfVTAdvHZTIJkMfue8BMPWDMDXLprHq7e8ixKXCcgSeucxbp hAQZWouw6owZPd/y1ulql7wEDxzwpBZyAZzDa41Iyy+Zem4AS+r/Hg3dH2hBPjN9GpE8 6DF5xtYVPADHNvvfcY7jmeyUCYFeq17I1+A+CNm36IITL+V4ldKZWypd4eutVkRGjxrU jEoVPAUGREtDgZyfjtGkJjqqBVHhZFrSXIOxLaMn/lRIZ5fU/rVnL2Z4rrU93xtZyJdm 7mQDQE1+y7x+wk8x0m1Vh3ScsbXDSI21wiq6AdxvjwxCGe/qt6Ui4rljX9cd+212UDtI zZGw== X-Gm-Message-State: AOUpUlFtsxNVQgpi+3dOjae1rkj8rOOorNYK4R7LU2DtzOLp2lCcAIyc ZJvo9kGBcgcqVw/pmUVf1RKVK6Vi X-Received: by 2002:a17:902:8e81:: with SMTP id bg1-v6mr15479947plb.129.1533596252837; Mon, 06 Aug 2018 15:57:32 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:31 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:04 -0700 Message-Id: X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [OE-core] [PATCH 07/18] bison: Fix build break with glibc 2.28 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../recipes-devtools/bison/bison/gnulib.patch | 21 +++++++++++++++++++ meta/recipes-devtools/bison/bison_3.0.4.bb | 1 + 2 files changed, 22 insertions(+) create mode 100644 meta/recipes-devtools/bison/bison/gnulib.patch -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/bison/bison/gnulib.patch b/meta/recipes-devtools/bison/bison/gnulib.patch new file mode 100644 index 0000000000..7eaf0ce0fa --- /dev/null +++ b/meta/recipes-devtools/bison/bison/gnulib.patch @@ -0,0 +1,21 @@ +Fix gnulib issues found with glibc 2.28 libio.h removal + +see +https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +Index: bison-3.0.4/lib/fseterr.c +=================================================================== +--- bison-3.0.4.orig/lib/fseterr.c ++++ bison-3.0.4/lib/fseterr.c +@@ -29,7 +29,7 @@ fseterr (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ + fp_->_flags |= __SERR; diff --git a/meta/recipes-devtools/bison/bison_3.0.4.bb b/meta/recipes-devtools/bison/bison_3.0.4.bb index 58728f5021..cc155f0fbe 100644 --- a/meta/recipes-devtools/bison/bison_3.0.4.bb +++ b/meta/recipes-devtools/bison/bison_3.0.4.bb @@ -14,6 +14,7 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ file://dont-depend-on-help2man.patch.patch \ file://0001-src-local.mk-fix-parallel-issue.patch \ file://add-with-bisonlocaledir.patch \ + file://gnulib.patch \ " # No point in hardcoding path to m4, just use PATH From patchwork Mon Aug 6 22:57:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143536 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3806860ljj; Mon, 6 Aug 2018 15:58:31 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfWeR0d1Iwjw1GhhWvmdISTx4gmDwfwtBjU/q6LjLDXxLPX/pCrauUkXTx8fh4zvUKtG25D X-Received: by 2002:a17:902:8b86:: with SMTP id ay6-v6mr15235364plb.25.1533596310923; Mon, 06 Aug 2018 15:58:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596310; cv=none; d=google.com; s=arc-20160816; b=Av6CuIjnZ3CWCy2saE44/dlSpgqyo+a9kfmobwd0iwOsecPSJTVJlNf68GMpibMT9O Wj9X2Hw35kSd9lF/BL9As0Iwl9c+1mawXJDVe4jEvapiJViL0+VgXtUddmFad95/HgFd qzLfZQLA19EGL1i7fhXNKD6RYL4brby7w6cY6jq6XMOWJmkZfpmvieSimXQaNihUjarQ XHwvraRT4EXB9OpTUWVZLFX+FHYZ5j4FJ1cKK4LuRNglwuKBwnsQefIfUghZpZGSEkGW oxSPMjTuMilcXpPxyFhkjVPiJZT8HDcJK2UyuxDOgmFI2p3/Vkj26EanAjElHIEcnmRP lbFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=cxB0ZSKqH7WrciLbRylhksp3TbdCX0qFMKCXQxHonWg=; b=RYoX2Z4Wj53qHnmwjrRuJ+Q+oGwDrpZG5uhgZohX4jdIUiONYNI9IyIlMb6WUq96WG Nw86CyNY92WqRPwPSEfvvX9A6uqi92gxOci++Zj626cGu6YJ2fapYfLD80Hu9abLY/Os FCY143LU53+8oSJJtin3Sc2/nKHDLs9DcUyHOA9LEHElBOCfGthOsb0me3oJomNR5Kn4 9J9zqx/GiLS0PuQXLs/tbcC1yLFYr6cBjfSK+KUlMQMjTX0VIuCXFTulosE82re01FrN ByFg0HLNepeKisN9MAgt38t1VzhdT6nRV6mJEH/T2/BNhz4ZC4RxqcKSXcEOUoExBRIw DBXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Bp4YpVnE; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id w15-v6si10990510ply.501.2018.08.06.15.58.30; Mon, 06 Aug 2018 15:58:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Bp4YpVnE; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9251178C1E; Mon, 6 Aug 2018 22:57:50 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f53.google.com (mail-pl0-f53.google.com [209.85.160.53]) by mail.openembedded.org (Postfix) with ESMTP id 870D178BB2 for ; Mon, 6 Aug 2018 22:57:33 +0000 (UTC) Received: by mail-pl0-f53.google.com with SMTP id e11-v6so6252441plb.3 for ; Mon, 06 Aug 2018 15:57:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JB8orQ2MiNtPbdXuSOmVd4nnQPZKGoHQ9VbMWICjYMM=; b=Bp4YpVnEH0OQgvtTtpm6EMmmuRsYPCwWAFmELFvDemgRJwwjykseo9hsik79k/YKOe GUt0w2VBD+EsUu/Pj9oNcjCvETxIQqcF9tVYFiowE+Ku4uTwiYmkMbF6TzzGdm0zbYib TNS6AUgCeqk/Gj7sxpYWkiTIl9NKgVreKAHZk8t8bbfOuKz8d4Ol3f+WhlR8K5Olzl8L 4dJKiTcVuF5aAHiXOnYXjr8hXeKcWrvqdOErJrQG5wpe2dgorUcOd1x2bWQkN1ZFfWC3 i8a0M5hXR0xNPKqQ2i6pgNNhgGDrnUnspvA88jPYq1JKExiV4kpzdOxdJzziZGdpeApI W5kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JB8orQ2MiNtPbdXuSOmVd4nnQPZKGoHQ9VbMWICjYMM=; b=Rn3nWV6xx0aNU7l9UhYG+ApiBCyBqm7+vQsyOvWnUsVL2mKB/NQAFz1l8YnDgg5NlZ 1uYJtIcuTIK5cQauc/gZcndWMlN1X9GtIIKrdd0kzIWIFdGTOfV9DEvP6of38LUDSMyF GkFCFuiHJA9O1V8SOnWh+PYPTlzmJFGqoYuYzkOaSWFDh+dBtnQ0wblhe7fMTCXR725g 0XbqEPdxp+Ecas0rihM1V13MMdRCq084ApAhc3R0YaoUEoqdEm38+uO7EsISn5t3ICx9 TJEzabHjrieurRUofKgCfcx3sEISRz2PbCq/AroFFKGL3khkunCw+RKB70Qy5Js0tWRe wwEA== X-Gm-Message-State: AOUpUlEYe980AihAr936hCKhgTCJ+OCWDqeeZGmNxbhfLnfhXmKRkkK4 vqrPH5jzJfqJd9N+EWBPmuE2FcTc X-Received: by 2002:a17:902:8482:: with SMTP id c2-v6mr15615936plo.45.1533596254265; Mon, 06 Aug 2018 15:57:34 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:33 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:05 -0700 Message-Id: X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [OE-core] [PATCH 08/18] strace: Fix build with glibc 2.28 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...001-tests-fix-build-with-fresh-glibc.patch | 42 +++++++++++++++++++ meta/recipes-devtools/strace/strace_4.23.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch b/meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch new file mode 100644 index 0000000000..ce6e567da0 --- /dev/null +++ b/meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch @@ -0,0 +1,42 @@ +From bba1b0085f2a2c83839647fee48628ee054aceb7 Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" +Date: Sun, 15 Jul 2018 22:14:29 +0000 +Subject: [PATCH] tests: fix build with fresh glibc + +Workaround additional incompatibility between and + introduced by glibc-2.27.9000-566-gfd70af4. + +* tests/xstatx.c (statx, statx_timestamp): Redefine before the inclusion +of to avoid conflicts between definitions provided by the +linux kernel headers and the GNU libc. + +Upstream-Status: Backport [https://gitlab.com/strace/strace/commit/3dbffb7] +Signed-off-by: Khem Raj +--- + + tests/xstatx.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/tests/xstatx.c b/tests/xstatx.c +index 7fb9326..441f4a8 100644 +--- a/tests/xstatx.c ++++ b/tests/xstatx.c +@@ -64,10 +64,14 @@ typedef off_t libc_off_t; + + # define stat libc_stat + # define stat64 libc_stat64 ++# define statx libc_statx ++# define statx_timestamp libc_statx_timestamp + # include + # include +-# undef stat ++# undef statx_timestamp ++# undef statx + # undef stat64 ++# undef stat + + # undef st_atime + # undef st_mtime +-- +2.18.0 + diff --git a/meta/recipes-devtools/strace/strace_4.23.bb b/meta/recipes-devtools/strace/strace_4.23.bb index 0c159fc6f6..d30d440abc 100644 --- a/meta/recipes-devtools/strace/strace_4.23.bb +++ b/meta/recipes-devtools/strace/strace_4.23.bb @@ -14,6 +14,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://mips-SIGEMT.patch \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \ + file://0001-tests-fix-build-with-fresh-glibc.patch \ " SRC_URI[md5sum] = "fad4bba0947553cef34d46a9fd78f039" SRC_URI[sha256sum] = "7860a6965f1dd832747bd8281a04738274398d32c56e9fbd0a68b1bb9ec09aad" From patchwork Mon Aug 6 22:57:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143537 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3806925ljj; Mon, 6 Aug 2018 15:58:36 -0700 (PDT) X-Google-Smtp-Source: AAOMgpefwD7fK2gnHoi0TbHMW50ga4z5aS2fsRKysO5NyQacVUldq5y52kYRm0gf0W45NpNIgmzO X-Received: by 2002:a62:b20c:: with SMTP id x12-v6mr19333606pfe.64.1533596316629; Mon, 06 Aug 2018 15:58:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596316; cv=none; d=google.com; s=arc-20160816; b=gkB1JTMCFl/jlKVHu3K606yiO8kO+uhhQVSLjxao9PVKVgcGYM7jP7pMt5AtvuzXkc 8Qq/K8UBxf4S+Hw1bewjtSznFwgYPxpLn6CMb9nA/QdbNiJgxhMITCH5UxfMYMuTr4dl T9TFx0L4WTwRYJFjgT8+1Lw0p680/pideO8wKh/6S53Yu6OohjLc420f044ZDt5omK5a RdfKe092fSuGumcsLbRzASGJP3KEnSVmtIYDbz+fvrvSlm9TUMUfHInBElTW7bMgjsFZ LVDfl0H5lGF0WYlMRJ1q6cWftXuflAmwgJj0AuM2gGA9bt0604DhVSiIQ8Xti4ChzEA6 BYqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=o0mGRoPp0DrVrFU5wwMTBxDCgZx0w176CloLJPBUoq8=; b=EO4/pSM232yg7O7aDuCQbu4pLfd+s6N4bts3rbn2gHp7Ddt7OtR0yI7aKU73l+w11j m+6kwyGRmDHY8f11sfMsByerpWChCuSOj0RvGdzMI9QAGl85wUvsJdmomSqYohaWtbji QMVFCJ0KTDzYU7fD7zDL2gWZXUHfYGTKekICwnif88C9IHfyIkAUop44gN5wo4MXpZbj fCUpxRMsEVF98ku1FYF6GxyhTT42kLl672dYrX0mRJBr3TkbjGqpZhnlng2XX3NszlEA 8nDrCFTG764qreJYCbVg5DHxk2g2c+OTCqgu1t/dteUulVxgvFHyeZCwdx3JWOPSlWCB t8ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=vH+naNDM; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id t128-v6si13994121pgt.614.2018.08.06.15.58.36; Mon, 06 Aug 2018 15:58:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=vH+naNDM; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A799378BF4; Mon, 6 Aug 2018 22:57:51 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f46.google.com (mail-pl0-f46.google.com [209.85.160.46]) by mail.openembedded.org (Postfix) with ESMTP id D65CD78A40 for ; Mon, 6 Aug 2018 22:57:34 +0000 (UTC) Received: by mail-pl0-f46.google.com with SMTP id g6-v6so2681350plq.9 for ; Mon, 06 Aug 2018 15:57:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Y4Ip7WKi9ZL1IJioYWqM5Dr9UWhjzwYHl635+GJaKRE=; b=vH+naNDMdl1b6zuearJbN7D1Xr9U/fUs+7yRWfY8PH1hnQ3e9Pqt5reMzNLZZB+a8U TM8AQr98f8JrPsfVZVHPzkKVcnMGksLShwUVa5AEsSHBkCWotQTilz1xOlqu1W3xWARw Hy5c/ZxBeDwhMmYRfQ4bacQMDrxGDNMW5DGkV95RkUOcmKp4VJFB1gRF11DQWL8Gekqz 6tQP6xdfIrM82EUNWv/pS77mDdWb7GVriFJR7gR7ACuaSn+hC/Fu60AjJmHYJASPFdJ6 iKGkxOMCTyGKCdLnHHpiq2p9XFabfxr0SAQts9oeWDdhdY+lZdGLybXsJZt0gfi+BR3o Xvdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Y4Ip7WKi9ZL1IJioYWqM5Dr9UWhjzwYHl635+GJaKRE=; b=mwwKlH+FlKDZKRzKcWN8nC8s2qLTmVNyU6JGbvuw4XriuAzcLrqCbdfnMBsJWSI8Vj hn0x4phNFiudUc4UxR8q1p47PM06qHdXDBlPUEfDHAEZ9R3tnD4l7Tn9NsTbHf/kBb0I P8BS+sYqvgdAv0bn+/v5txHnp2np7km+wvtfnl9xjD0hYY8pWNPk+aRoRrCqSklBkCgH KDWH66aQBRODpbx3q7zvLjNDyc60Cjdj6UosUl2WyrhBnDwBKleuC0eUAHMS+czdQEXG D0/0rBHqOs9gPzXKUlzAqVzCRg95B8N5BW+Ylcg2MFjj0pC2XF7+rnBNDKZqZroT56VB QgJg== X-Gm-Message-State: AOUpUlGOh+OONDLNKjZ4AN+bovMEHluJowugS/esBGiz8z1QpgSxfvK2 vYcffh1ZfU67OFz20RswcS5Al1gz X-Received: by 2002:a17:902:301:: with SMTP id 1-v6mr15512254pld.127.1533596255663; Mon, 06 Aug 2018 15:57:35 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:34 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:06 -0700 Message-Id: <2c149d2fe995f6e460586d1d8ec8ed268932f611.1533595822.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [OE-core] [PATCH 09/18] blktool: Fix build with glibc 2.28 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../blktool/blktool-gnulib-makedev.patch | 23 +++++++++++++++++++ meta/recipes-extended/blktool/blktool_4-7.bb | 1 + 2 files changed, 24 insertions(+) create mode 100644 meta/recipes-extended/blktool/blktool/blktool-gnulib-makedev.patch -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/blktool/blktool/blktool-gnulib-makedev.patch b/meta/recipes-extended/blktool/blktool/blktool-gnulib-makedev.patch new file mode 100644 index 0000000000..6eea608b29 --- /dev/null +++ b/meta/recipes-extended/blktool/blktool/blktool-gnulib-makedev.patch @@ -0,0 +1,23 @@ +include for major/minor defintions + +Fixes + +| ../blktool-4.orig/blktool.c: In function 'detect_dev_class': +| ../blktool-4.orig/blktool.c:295:10: warning: implicit declaration of function 'major' [-Wimplicit-function-declaration] +| switch (major(st_rdev)) { +| ^~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +Index: blktool-4.orig/blktool.c +=================================================================== +--- blktool-4.orig.orig/blktool.c ++++ blktool-4.orig/blktool.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #include "blktool.h" + diff --git a/meta/recipes-extended/blktool/blktool_4-7.bb b/meta/recipes-extended/blktool/blktool_4-7.bb index 4551c3233e..0e6f7ee6df 100644 --- a/meta/recipes-extended/blktool/blktool_4-7.bb +++ b/meta/recipes-extended/blktool/blktool_4-7.bb @@ -13,6 +13,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/ file://0001-fix-typos-in-manpage.patch \ file://0002-fix-string-error.patch \ file://0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch \ + file://blktool-gnulib-makedev.patch \ " SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40" From patchwork Mon Aug 6 22:57:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143538 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3806970ljj; Mon, 6 Aug 2018 15:58:42 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdEngDP/X4+K2KETQYDqaGO5wREIDpaWu1nn222K1YrSCzgReTWzMzinkJWrmUmK8PYD1Ec X-Received: by 2002:a62:cd82:: with SMTP id o124-v6mr4470991pfg.206.1533596322122; Mon, 06 Aug 2018 15:58:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596322; cv=none; d=google.com; s=arc-20160816; b=Xs61kVNaGgnlIC6aBlTqfa5TOwL0gY84Nxpf0nRXWlXARuuwd5Nr+LSSeobhFBw6Zs SSmhe3X6HJNMvPtBDE77IssP9uw3Wl7gL2DwRB9Ro34HCo0AFdpqokq3ou3Df+c3kwnI yeCCOlWGPcjZ/RMWtUTB8vvYCBUYGZIcPq/8tYnhNrB4rkWG1X00I/lgB0mkfcT35GTe by4y91DI35VozXcVzS6adSlRE/qqW8H67HB1hH0c83EU3TmhkWwwP6NHVGo7bv+/kjql rTAQdpfdyvnppDmu6OCE0MnojEZpbsdS7XDnC5Y/IUj8ggqWvcKL8EjDdZGcwIo+LDof /u4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=febBKcMKMuAPOYCHzitPWXN06gcseSzvvc+gpWVrwZk=; b=gtOx9J5mU84wa4JHY8rSCB7CZEF4CzHnEjkmEmMIvhyuwhWKxlfi/Ke3sIFeN3Lhm9 /NiQcrl6uZmOoVrWy7zi4qL9McVVLNwWT/eXQ3hfaFPELSEpyHQW27UT9MMhlYg4SpXs yvtZSj2ie3lmS+AHVXWXOXSlUVdhwZtzSFMzpBTraz7gN5SmefJylyRW3OHkXaXo/skI f8QyG35/XJ1ISZVX6dwCjIyCYskS9Iv+q8e1m42hADGQv2GYpqf5KEVym3Qma9CgCslS GE4uVCI33/HB7AFQODOLphBKVQyvmp418y76p8uHPz4MHr3eYa3/NfpJIDU7zBv21MZ/ mR2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Sf1WBXn8; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id f62-v6si16337922pfa.73.2018.08.06.15.58.41; Mon, 06 Aug 2018 15:58:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Sf1WBXn8; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id BE69278C58; Mon, 6 Aug 2018 22:57:52 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mail.openembedded.org (Postfix) with ESMTP id EADB6745BF for ; Mon, 6 Aug 2018 22:57:35 +0000 (UTC) Received: by mail-pg1-f176.google.com with SMTP id r1-v6so6856485pgp.11 for ; Mon, 06 Aug 2018 15:57:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YV7WVCtmXXVqkhRQQk04uE7alOBBn7sOwMaub96nGSM=; b=Sf1WBXn80ef4eIgwI2jE6V+VMEZDvkI6Srgk9vNtCA6YGlSiM43UKYBhHJ9nrXoZb/ I+E5MrYVkbguXnqA/XA0Yq3B9LZuifW56mnDtO2Xbpr7sNBACOeUdqZB3+j/HcQJtfHi YrFNEQ5gaZGqQfkCBlMIQCrD6hHzgFh53ZtW/dbaPhbOFlhLfaXyI2C6TvywrKc2FkIq 8Zv5lb7E8PZVBv0hYsQZD3NRK+dH9ixLYVi2y81UfxghAxJufJBWJSqRg+TbqTUgv9jP YZ766sr+foXfH5yXntKmmwULkm838tU+OWxnyavuulDjKCIu+zZBNvrJA8rLZsCIjkbi P9Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YV7WVCtmXXVqkhRQQk04uE7alOBBn7sOwMaub96nGSM=; b=WoG8L6mUs7EAttALBfZu0p00s/WfhJ3rfkomzhpt/hhUDEfDrkrULl1bVotmjp5/1G RCi6unzRfhNga1jZ69QF3BwTxMReUBr0E7RrIxgNGtyOXYYWMQ58O8Uk4zqdaLo07Eka giPRuxJnAoQR7eXW6/fl82TOpfHLToXx12w2998pjwAY3PQmzLmPZDU1O15FJYL5wIQr 39ItaNqzTej+o87oTYemIb+uYGP7mMqXdJn/yoN20N02HBz4EzO8kyJxhyuWn36Gp15s L4KAxks0hG9F2URAOpiwGacQtrQYD6VOTh1U+YrXgTlbeisxrizN8JeJQDe4PYokUqid FzlA== X-Gm-Message-State: AOUpUlHWLeM4ySvBkXraa8L2AVtL2WA+NKShDRj8HjzacWhAYpzpE2Fm 80C1EXDWpj9rsNsAt7hv1d3wZ8Df X-Received: by 2002:a62:cac5:: with SMTP id y66-v6mr18887033pfk.187.1533596256694; Mon, 06 Aug 2018 15:57:36 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:35 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:07 -0700 Message-Id: <06c361481025023e6ad962759e5968bd9c19c0b7.1533595822.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [OE-core] [PATCH 10/18] ppp: Use openssl for the DES instead of the libcrypt / glibc X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../ppp/ppp/ppp-2.4.7-DES-openssl.patch | 84 +++++++++++++++++++ meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 5 +- 2 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/ppp/ppp/ppp-2.4.7-DES-openssl.patch -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-connectivity/ppp/ppp/ppp-2.4.7-DES-openssl.patch b/meta/recipes-connectivity/ppp/ppp/ppp-2.4.7-DES-openssl.patch new file mode 100644 index 0000000000..e53f240543 --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/ppp-2.4.7-DES-openssl.patch @@ -0,0 +1,84 @@ +Used openssl for the DES instead of the libcrypt / glibc + +Upstream-Status: Pending + +Signed-off-by: Khem Raj + +Index: ppp-2.4.7/pppd/Makefile.linux +=================================================================== +--- ppp-2.4.7.orig/pppd/Makefile.linux ++++ ppp-2.4.7/pppd/Makefile.linux +@@ -38,7 +38,7 @@ LIBS = + # Uncomment the next 2 lines to include support for Microsoft's + # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux. + CHAPMS=y +-USE_CRYPT=y ++#USE_CRYPT=y + # Don't use MSLANMAN unless you really know what you're doing. + #MSLANMAN=y + # Uncomment the next line to include support for MPPE. CHAPMS (above) must +@@ -132,7 +132,7 @@ endif + + ifdef NEEDDES + ifndef USE_CRYPT +-LIBS += -ldes $(LIBS) ++LIBS += -lcrypto + else + CFLAGS += -DUSE_CRYPT=1 + endif +Index: ppp-2.4.7/pppd/pppcrypt.c +=================================================================== +--- ppp-2.4.7.orig/pppd/pppcrypt.c ++++ ppp-2.4.7/pppd/pppcrypt.c +@@ -64,7 +64,7 @@ u_char *des_key; /* OUT 64 bit DES key w + des_key[7] = Get7Bits(key, 49); + + #ifndef USE_CRYPT +- des_set_odd_parity((des_cblock *)des_key); ++ DES_set_odd_parity((DES_cblock *)des_key); + #endif + } + +@@ -158,25 +158,25 @@ u_char *clear; /* OUT 8 octets */ + } + + #else /* USE_CRYPT */ +-static des_key_schedule key_schedule; ++static DES_key_schedule key_schedule; + + bool + DesSetkey(key) + u_char *key; + { +- des_cblock des_key; ++ DES_cblock des_key; + MakeKey(key, des_key); +- des_set_key(&des_key, key_schedule); ++ DES_set_key(&des_key, &key_schedule); + return (1); + } + + bool +-DesEncrypt(clear, key, cipher) ++DesEncrypt(clear, cipher) + u_char *clear; /* IN 8 octets */ + u_char *cipher; /* OUT 8 octets */ + { +- des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher, +- key_schedule, 1); ++ DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher, ++ &key_schedule, 1); + return (1); + } + +@@ -185,8 +185,8 @@ DesDecrypt(cipher, clear) + u_char *cipher; /* IN 8 octets */ + u_char *clear; /* OUT 8 octets */ + { +- des_ecb_encrypt((des_cblock *)cipher, (des_cblock *)clear, +- key_schedule, 0); ++ DES_ecb_encrypt((DES_cblock *)cipher, (DES_cblock *)clear, ++ &key_schedule, 0); + return (1); + } + diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index a1bb7d71c1..f4646bd693 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -4,7 +4,7 @@ the Point-to-Point Protocol (PPP) on Linux and Solaris systems." SECTION = "console/network" HOMEPAGE = "http://samba.org/ppp/" BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs" -DEPENDS = "libpcap" +DEPENDS = "libpcap openssl" LICENSE = "BSD & GPLv2+ & LGPLv2+ & PD" LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \ file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ @@ -32,6 +32,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://fix-CVE-2015-3310.patch \ file://0001-pppoe-include-netinet-in.h-before-linux-in.h.patch \ file://0001-ppp-Remove-unneeded-include.patch \ + file://ppp-2.4.7-DES-openssl.patch \ " SRC_URI_append_libc-musl = "\ @@ -49,7 +50,7 @@ EXTRA_OECONF = "--disable-strip" # Package Makefile computes CFLAGS, referencing COPTS. # Typically hard-coded to '-O2 -g' in the Makefile's. # -EXTRA_OEMAKE += ' COPTS="${CFLAGS} -I${S}/include"' +EXTRA_OEMAKE += ' COPTS="${CFLAGS} -I${STAGING_INCDIR}/openssl -I${S}/include"' do_configure () { oe_runconf From patchwork Mon Aug 6 22:57:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143539 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3807033ljj; Mon, 6 Aug 2018 15:58:47 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe9By1e/aUqUDX9azg9ZapN3/HL+xpWqj5Xg9r/YgpJ2z9EFUMPt2k6ZxaLQzs3HCZfTVwa X-Received: by 2002:a17:902:1:: with SMTP id 1-v6mr15767401pla.167.1533596327853; Mon, 06 Aug 2018 15:58:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596327; cv=none; d=google.com; s=arc-20160816; b=rbyYrsYSktQwnLkFmpldxbQAHbRGoEcdcnn1zaJUvcAv1czNSaQMjk1NTBmyhgIwx0 x4inBBTnWcrgTGQsx+1y52TmNIQPFg2T8k8oqAQ2hiqpBV5RLXVHzpJ6ouoYzH+v9b5q +02QFq7iBgVy7N+SQVGLhryntIjJdZoda4JMxzGyXWw1ZeRVzCosDV5XvcY8h1F+x1Qn lw9LN32HG+8JQlchKGxBVyhpNGcVy/V5zmwsIeA8NzVfazBPDXjCpvGv/IyjRBQc6COw RhCBUM8vY+vZjd9HwVNw12fkFyOjNCdY+8rwlH9GLolbNE+FrfItPECbHFpsTf7cBrot dekg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=+wLEY54VN3n1bXcUbNn8PFxRkEf4r3Fz2qUY9tBZiVk=; b=S1jDTiLu1HG5YN5cQTWa/KCH1jJfMGcD5l+UGs4iwmtlenvtz0vBUiilKGf13v9PzP tH+uqy3EP0NifPuKLez++KURQJQkV6tGBBBJIUucttxT3agG62yJ1PmANedXRP3UdfRL eLnz9ihcW7XD1Tr6UbWNSJUOuu965K3oUfRsquE2Sv6gZUiNIMfqqb67yKykR6k4LN00 LOKU7J0PTcPe0kqYx7qYCSnouPABAHHLaLD/tRq7FmRSDzy5FImA+aubAKuWimeUSJBr VAulOZnUvEXnXQP5/w43KBa11v8DkHE3of/xGdlIC5sX0LYtX7L9wzEI7smxASLKzzCW zHVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=G2RSGRS1; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id n64-v6si15133549pgn.247.2018.08.06.15.58.47; Mon, 06 Aug 2018 15:58:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=G2RSGRS1; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id D4AE678C6B; Mon, 6 Aug 2018 22:57:53 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by mail.openembedded.org (Postfix) with ESMTP id 3B68078A85 for ; Mon, 6 Aug 2018 22:57:37 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id i26-v6so7531412pfo.12 for ; Mon, 06 Aug 2018 15:57:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fR2ZAFZTWtAVw1vebWIv7pyIs48pjIK8IGW130Cswqw=; b=G2RSGRS1Ij1tDfm3y7CfyHHcHzJ5QPQIPd7gnj9wXpLeA8m08MAFbAHLI/rBcfi7RJ zXVBp0ba7IyUoUvDnJp41McvFeIv0SOio6dCu77L1wcdBh+71xdxD70nqC6XHHN2j9R2 VNvC0YqcHzJf8n/hjHYbRVsHq5cUbiI5Rza57Mz6A7wIy8vuCxmWJkXCTTY7WNljeyHH 1cshlWi2irrla8Ne7n3hTu4aDlxqGKCP0S2XMSHvepG7/92zt5TdgC2sKxniA7AfnZ1T Tg0djdwo9339DTvQ0Ctxua7b5cvFn8Crp/0Ei4ve427CsHiLW7UcmPOjYMeIa+il/WJ4 1WrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fR2ZAFZTWtAVw1vebWIv7pyIs48pjIK8IGW130Cswqw=; b=gtQVRX8kmhAGGfBnqWAjZ+q/xa8Xac7sf1/P7kdOoLWY+IMfl6HhL8oyEUtnDzn8da tt6HX00ZkIxeKx+DdDbvMEgQbUq7od6vJqL+Arb0kzM7xJ+7TUcjgoywH7SeZHWoW26O nrjgmxyTVaDZ4NarL+N1KJ3OrYDuceOp4XbGA1ZAd0vgKayqkdFn15J+RM/9Dkwjjht/ XFFvW1Ny+qwV5O3kf5qZfEgYzKm92kB5USqBwCiu1rvVo+eBpYpomZMg+dIeRtcEtZY6 s+K9z2zKWYPFARD1RG/4Ixk75Ds9v/DYzye07HxTwzrDxxo06Jwe4kxZ8UOqK83jE+zi yolw== X-Gm-Message-State: AOUpUlG51p15Z/GEKlNW3/KJjNy9qAcs0RLDM5YGDTlgObaFS4Ni6m+v 4w7CiOlrHxxc64b4i6kNTw28qalg X-Received: by 2002:a62:20d8:: with SMTP id m85-v6mr19280515pfj.74.1533596258010; Mon, 06 Aug 2018 15:57:38 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:36 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:08 -0700 Message-Id: X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [OE-core] [PATCH 11/18] glibc: Drop packaging libcrypt from 2.28+ onwards X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- meta/recipes-core/glibc/glibc-package.inc | 2 +- meta/recipes-core/glibc/glibc.inc | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index a4f61f8e87..0e0dacec95 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -14,7 +14,7 @@ RPROVIDES_glibc-extra-nss = "eglibc-extra-nss" RPROVIDES_glibc-thread-db = "eglibc-thread-db" RPROVIDES_${PN}-pcprofile = "eglibc-pcprofile" RPROVIDES_${PN}-dbg = "eglibc-dbg" -libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/libmvec-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" +libc_baselibs = "${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/libmvec-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" libc_baselibs_append_aarch64 = " /lib/ld-linux-aarch64*.so.1" INSANE_SKIP_${PN}_append_aarch64 = " libdir" diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index 3db55f926f..91491a35f0 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc @@ -34,9 +34,7 @@ siteconfig_do_siteconfig_gencache_prepend = " \ # nptl needs unwind support in gcc, which can't be built without glibc. DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial libgcc-initial linux-libc-headers virtual/${TARGET_PREFIX}libc-initial" -CRYPTPROVIDES = "virtual/crypt" -CRYPTPROVIDES_class-nativesdk = "" -PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc ${CRYPTPROVIDES}" +PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv" inherit autotools texinfo distro_features_check systemd From patchwork Mon Aug 6 22:57:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143540 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3807101ljj; Mon, 6 Aug 2018 15:58:54 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe3+4hFhEQ4nf19+H0376i9u/8AkJLaFg+vDDe/9hL3nCrd9z+OJJwo14CzaiuINN1h2T83 X-Received: by 2002:a17:902:9687:: with SMTP id n7-v6mr15185074plp.33.1533596334463; Mon, 06 Aug 2018 15:58:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596334; cv=none; d=google.com; s=arc-20160816; b=HvuW89BIBaFwgH7SB3/7lBiHBIcOFerV6i81bozmPtdp9R21f8I39kSCv9I1ytLQkY MpKznt8wvPz5aWmK3er2FTpZn/QupY8aKDRTqPf5QEYsFAfMo/sWW+H2bSYTpyRaA31I VejEhHiI78/0kv7cGEqeNkP7G4J1Vx9X/5DuhImVKVOiqMs+LHw1uf6i/5to0x6d1lkn RcTavB7ggKnDZFJTloGRlC4KAYSh4OSgbnGYr7q6de1MhlCoF+PfICUfpp29K4qYSlKw eHBgInj4Rz/9q+52n5nDJ54/jenf6BRB1wI7JTleSGffd17sNaFam5/asv0+3HDsCwyw mX/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=R2FBY8dImHiMNz8fqw+oJGJAQwThCFze2fg1wr20CLc=; b=cEsAjmgJ7acCdMR1vyKixNgBaFWCuQSHkFpZcUOq/Dq28B/PZdWgZ2LLceQahbxkN1 bzb8Atso7kT2HvoWymfNY7oxGifsEvhiZfvMc+v0p/fcHyf4R0DYZhE1JfZaQ7OgPJeU LXUVFYUFbFu5nyRPv4yUT4a86xAIFeXStf8xsmtV3aYtztq0OCwkoScaKj9HfwBULOjx V3hAR73XYhLWyrxa4hVHArcYwfmPSTWXkBnFNrOqaK5jeS6+FotT3j7oOflVcuqwOWz5 ez6U42HdRX6IDk9uOav4KIiwHVeKpLU0MZGzdkBAO1jyEQ7d/7irqJvPv1gWEbTCD/Ik jJnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bJ817hfq; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id s17-v6si11067790plr.120.2018.08.06.15.58.54; Mon, 06 Aug 2018 15:58:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bJ817hfq; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 21F5F78C87; Mon, 6 Aug 2018 22:57:55 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mail.openembedded.org (Postfix) with ESMTP id E16FA78A81 for ; Mon, 6 Aug 2018 22:57:38 +0000 (UTC) Received: by mail-pf1-f182.google.com with SMTP id k21-v6so7538565pff.11 for ; Mon, 06 Aug 2018 15:57:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7wmB5kpUKAitlijzkpxrSVXBSrvAqx3kK3/tCiAZDOk=; b=bJ817hfquJKCuuA12WlZAQCeojmAuJPtoBngtPk9+oi9OVjtJpryzux8iY9lk1/6J5 E4JEfUHqQYJCbBEiysa9qpqizXnzSkZcR2uvXkL1DugigtKiTO7bYtNd9KjxBW1IfKsH 0mNvp+KEP28VxuFlAGwojwW6/0IAxuBV45Cj09XFh/YK2QLVuKUWAaCw6rFjqJcHaRGM A9xPYc2sFMOhxAPGLDWS1c844wWUaOu0RbtkxVULAFoTtuynr/F/GSSmWn3FSs2T1G8Q SIZhkHdQur/6CtPZWNaOM+hhdHP/2PbZKG0caRfpFGVAHpvjuxALKxYJ/I9lTJDoiq6Q 1Jxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7wmB5kpUKAitlijzkpxrSVXBSrvAqx3kK3/tCiAZDOk=; b=ZpYbsV27ImxY6Q4Xs/HIJyppg3+uy5Bj/u3QV/l4BDvXBY9tgJN5WoQKdbZLnVnV1H wKQgHWaksquxwHKM/Ju0fFy/+LClj3gAVmbx9bggKr/ai+/vMZxLQIeG9FuNOHUNdWWa lTcLKgwi0a7TrqDf1XLTNBpxfBsXSWUyRtodSegLnu8Jd089PqbnwVN3IMAKeXPX3uvC n258AJaNoXAAUyILrqPdCryqgJXg4eew6/AUnR4ICXVlj3JGmuR9kfMLSNStYOEj4HB9 SdnRWjBgoa3unExJ887Y+ouxd/Pwd79K3v28T34gI0JRm/PuZbY4M0iFF08GXWUUDHI/ 2oVQ== X-Gm-Message-State: AOUpUlHbNYGA1Z7dxryQ0apJWejXvzpfle8DgTVm78ReVwNajc4osaMv WtnKsYwnfx6o/FMdhrR1Q/HP5O48 X-Received: by 2002:a62:20f:: with SMTP id 15-v6mr19247834pfc.100.1533596259678; Mon, 06 Aug 2018 15:57:39 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:38 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:09 -0700 Message-Id: <563af53c1631ecf74494d2e28941874c05a39cb7.1533595822.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [OE-core] [PATCH 12/18] file: Update to 5.34 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Distros which have glibc 2.28 on them otherwsise fail to build due to some syscall mismatches Signed-off-by: Khem Raj --- .../file/file/CVE-2018-10360.patch | 32 ------------------- .../file/file/fix-bogus-magic.patch | 32 ------------------- .../file/{file_5.33.bb => file_5.34.bb} | 4 +-- 3 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 meta/recipes-devtools/file/file/CVE-2018-10360.patch delete mode 100644 meta/recipes-devtools/file/file/fix-bogus-magic.patch rename meta/recipes-devtools/file/{file_5.33.bb => file_5.34.bb} (91%) -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/file/file/CVE-2018-10360.patch b/meta/recipes-devtools/file/file/CVE-2018-10360.patch deleted file mode 100644 index 7f5671b834..0000000000 --- a/meta/recipes-devtools/file/file/CVE-2018-10360.patch +++ /dev/null @@ -1,32 +0,0 @@ -From df494f4ca494b5e1044052d96a6092a16ef1f6b3 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Sat, 9 Jun 2018 16:00:06 +0000 -Subject: [PATCH] Avoid reading past the end of buffer (Rui Reis) - -Upstream-Status: Backport -[https://github.com/file/file/commit/a642587a9c9e2dd7feacdf513c3643ce26ad3c22] - -CVE: CVE-2018-10360 - -Signed-off-by: Yi Zhao ---- - src/readelf.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/readelf.c b/src/readelf.c -index 3df0836..d96a538 100644 ---- a/src/readelf.c -+++ b/src/readelf.c -@@ -825,7 +825,8 @@ do_core_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, - - cname = (unsigned char *) - &nbuf[doff + prpsoffsets(i)]; -- for (cp = cname; *cp && isprint(*cp); cp++) -+ for (cp = cname; cp < nbuf + size && *cp -+ && isprint(*cp); cp++) - continue; - /* - * Linux apparently appends a space at the end --- -2.7.4 - diff --git a/meta/recipes-devtools/file/file/fix-bogus-magic.patch b/meta/recipes-devtools/file/file/fix-bogus-magic.patch deleted file mode 100644 index 9a33ea7a0d..0000000000 --- a/meta/recipes-devtools/file/file/fix-bogus-magic.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c637aaad6f0db5ad45a5296c837cb1f5253d3e3a Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Thu, 24 May 2018 18:54:40 +0000 -Subject: [PATCH] fix bogus magic - -Upstream-Status: Backport -[https://github.com/file/file/commit/4fb6a59df80d4974f8230bfce36e38e6de7d574f] - -Signed-off-by: Yi Zhao ---- - magic/Magdir/dbpf | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/magic/Magdir/dbpf b/magic/Magdir/dbpf -index 65cab61e..e81c5538 100644 ---- a/magic/Magdir/dbpf -+++ b/magic/Magdir/dbpf -@@ -9,9 +9,7 @@ - >4 ulelong x \b, version: %u. - >>8 ulelong x \b%u - >>>36 ulelong x \b, files: %u -+>>24 ledate !0 \b, created: %s -+>>28 ledate !0 \b, modified: %s - !:ext dbpf/package/dat/sc4 - !:mime application/x-maxis-dbpf --4 ulelong 1 -->8 ulelong !1 -->>24 ledate !0 \b, created: %s -->>>28 ledate !0 \b, modified: %s --- -2.13.3 - diff --git a/meta/recipes-devtools/file/file_5.33.bb b/meta/recipes-devtools/file/file_5.34.bb similarity index 91% rename from meta/recipes-devtools/file/file_5.33.bb rename to meta/recipes-devtools/file/file_5.34.bb index a29402a0ab..6612b71000 100644 --- a/meta/recipes-devtools/file/file_5.33.bb +++ b/meta/recipes-devtools/file/file_5.34.bb @@ -16,11 +16,9 @@ UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P(?!6_23).+)" SRC_URI = "git://github.com/file/file.git \ file://debian-742262.patch \ - file://CVE-2018-10360.patch \ - file://fix-bogus-magic.patch \ " -SRCREV = "219846094c7593e27453e62855e61181089c48cf" +SRCREV = "315cef2f699da3c31a54bd3c6c6070680fbaf1f5" S = "${WORKDIR}/git" inherit autotools From patchwork Mon Aug 6 22:57:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143541 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3807195ljj; Mon, 6 Aug 2018 15:59:00 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcyDiK5eQ54P07sQqnRGEgeyN2s1GmNP+9nqPaaZZoc36yxAVO1zcqhjs5eqESPIfNcOc54 X-Received: by 2002:aa7:82c3:: with SMTP id f3-v6mr19030933pfn.136.1533596340806; Mon, 06 Aug 2018 15:59:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596340; cv=none; d=google.com; s=arc-20160816; b=MDqtwNGfY8lp1qAbehsx1I/WFXcLJqaYUEpzFzoJJUJdFv4OB+texz7Nw9QcSxLm/S 8BAoPVgndx+58gSYelh1MP2kOO+UrS5BeeGrq4FUDJ6hPtwYvE/N8nxB9kEoA8W+inDb ZczpYqUCBy3+dmnLYRWYbMh0LqUQI7SezsgWQIyvWmL8//fAQEvzv+f/he+o25mNDEj3 jO+JfjT7jSWXhpKcbAV03sEzeBuPKOV7460TlVFBZwfg/vCJK4SpZBpXbj90MKfxSb8K U/+cHrvjZcaZGa5wXm1vHc4xjUu0s3XoAfzO+Ai8NhsXwcwJ+u/fuDoawgwqqupi9fbt 3Rtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=vbzPNE1RB5bNlwEL6RpT5RCo8b19/AHLR43B4QS491o=; b=hJ2JUsAMvN8Kps0TpupzUYcejaCXrC7re3wyaRNy6E6HPUxK/YJ5Oqtk7bEOY5oI8R M8ZBcBV1OVujmQ0jy0tFStIz2RCxNf8wquZktXAJ9WCWx/wXTrz2IUKA4f1wdAj2lD3o 1404YIaV1aunBlyaXqvStNd3oaezZnk4n95gU9mU7+ct1pIZQVcK5O8m/Ilc8A+m8GWk GWJmo7TKJV3wPSMo8QXWV6rSmu0SzDNVWpAMsIUyaG+TllWCz/8xggiKnxqiuR+0aWVC YANb7Y6FkW+TNFR85j64SUbYb3s27sAyq06btXaQ0S3V+oSSpl/oYQ5mLGFuy5J6VGWe qszQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=j2tZoY0p; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id o19-v6si14198346pgl.212.2018.08.06.15.59.00; Mon, 06 Aug 2018 15:59:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=j2tZoY0p; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 39D9878C8E; Mon, 6 Aug 2018 22:57:56 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by mail.openembedded.org (Postfix) with ESMTP id 0AFE978A30 for ; Mon, 6 Aug 2018 22:57:40 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id r5-v6so6878507pgv.0 for ; Mon, 06 Aug 2018 15:57:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LGLFN106u5eoITrpuUJyMaiuwb6rLfGBXxskqITYigE=; b=j2tZoY0pbGd8PBSc6I0fFjwVl+7FPJrBC2dyMz59mQFAM8x9ikfHQOjHoktuo7tIUX ERROo6UfcL10aWkpEnnpnSEvMHWiNh2oo80lT9/vGh+8e1VRS4Cq8UqqNA7zr0nLupi9 nk4qc+8K/szVU4UEqSCMLTcVi7JNfd9if+HKUC8YK0dHW2Kat8ilfVdtpyPWkpAEIfx2 u6uC+aP+t82nXgTbNCMBkEaly527/qX+NFbYFILis0n5Eltt2b70Le4W//sqUU/BLPU4 Jz48vSDWyj/YDOOnx1quqc6L+1plnbk35hj67WmbT3MO5YtmTD7q3So4r3H0Wq8TQJ49 gYPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LGLFN106u5eoITrpuUJyMaiuwb6rLfGBXxskqITYigE=; b=GfZk/RhlmEkoFKRQWz3HB/sxXGcyYxaJ2KmeXnES7DRDD/Q+4rZxYtD4P++tt/gMym XS14J6wYVvZk3DzUvnfNfMjmhe8vYk0GUa1cY+GJyRi8KxL2UOcigm1r5Ho5DOM6IazH NH2xayJpwtDnNfJ4rlF2kPrvjuaIVEZvzOumAU+vLnncj6THLUK09Og4uZr4CXCj82lM sA4/eLLPFB9j0v4OaRiGCrmNFIzRiNiLvA8oiGish/rOFEz7LbYY3mF9szGEtFhijwRb vPRqMkGBC0QmBVRaUNB74to2sbpvEZ+Fs7M7Dgb+03b3nKgYjt0ImVqSWAH+OkhRf5Iq 8EKw== X-Gm-Message-State: AOUpUlFkhv9dBsKCDaiQOmrdo2sWWj/tFdUJPNmDspfTqhgJ0m9QpnDY IpEm+kGLA86sO6wYErlL9kYQW9N4 X-Received: by 2002:a62:1d49:: with SMTP id d70-v6mr19396694pfd.101.1533596260929; Mon, 06 Aug 2018 15:57:40 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:40 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:10 -0700 Message-Id: X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [OE-core] [PATCH 13/18] Disable crypt support in glibc X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org We have independent crypt implementation coming from libxcrypt Signed-off-by: Khem Raj --- meta/recipes-core/glibc/glibc_2.28.bb | 1 + 1 file changed, 1 insertion(+) -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core Signed-off-by: Khem Raj <raj.khem@gmail.com>
diff --git a/meta/recipes-core/glibc/glibc_2.28.bb b/meta/recipes-core/glibc/glibc_2.28.bb index 086daed04c..906e6c2b62 100644 --- a/meta/recipes-core/glibc/glibc_2.28.bb +++ b/meta/recipes-core/glibc/glibc_2.28.bb @@ -83,6 +83,7 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --enable-bind-now \ --enable-stack-protector=strong \ --enable-stackguard-randomization \ + --disable-crypt \ ${GLIBCPIE} \ ${GLIBC_EXTRA_OECONF}" From patchwork Mon Aug 6 22:57:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143542 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3807243ljj; Mon, 6 Aug 2018 15:59:06 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfRQov5O4+QT+b/2f/yGnAhk9Rm3iFZCBGBjemhRD1hk99bPdPypxfV2Ifbl0s0GhHmayJE X-Received: by 2002:a62:b604:: with SMTP id j4-v6mr19133086pff.199.1533596346583; Mon, 06 Aug 2018 15:59:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596346; cv=none; d=google.com; s=arc-20160816; b=E1WYavKjgkv5c7+LkbLxaDLBMnANuTHU5HqlkQoV44uPlV73p8JCRM2XgA1xpavjkt GVspy3dUJAzg6/3+rl8Yc8TZKFTdr/rujQIBlISI5zuillvtgtJj6qsCtPMEFIrkO+xa G/RXUu7wEvC82LdC0X+SOkKC85IVkD66hqJLYgWNpdeZUtEQGpmr/y3foeS9QlPLbxYO fHJ4RBsyV3+DNVjz+dkM02/so3OAwVDNXXZzd6/LlEFeKrOG4o26mB0y7VheMEYoEasP bCsAvkx78eV1Lj9CDBhxx4Jx9GGvE6xe50KOt8kxy8rBJ1cR+b2K9K4zF6bfcxc3Gaoi EcdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=mPUnX52g0BBvwlITdXWQyOr+LZ3MSt653S1fDvNnZ3A=; b=L7XxgB68DTEo2bcLvFh8hw2bJfmSLhQCEzKdzye807pklfy6aNiRZ1TEjjQMSUNdBO b5Ra7HUwrOGKQQgvWKHzbysG+YXPn40gRCWTKOkhpzP/M4FCsjdi3FqkVKpVkZrTyWKF exCs8ai5WXW2eLlzVuquQZvH+SyBeXsQkEZduSw4z8uz2IIY/EXGXVP/VUM0XVZHAaAC 5pGGv4m04xQwocNui4ivAz4V8oYJcq3AvVymseEnRBc8oByKd1HHI+Dx/N3EcWfnRXEl xQBf+Lw36w76PFPc927ev9mZrDPnnyIMr1ovk/3vSO34lVHUu/FNKte7r1iFDgjCl0Ks RUKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=U0uAZ4L3; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id v3-v6si2276365plz.419.2018.08.06.15.59.06; Mon, 06 Aug 2018 15:59:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=U0uAZ4L3; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7104278CA2; Mon, 6 Aug 2018 22:57:57 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f44.google.com (mail-pl0-f44.google.com [209.85.160.44]) by mail.openembedded.org (Postfix) with ESMTP id 56C9878ABA for ; Mon, 6 Aug 2018 22:57:41 +0000 (UTC) Received: by mail-pl0-f44.google.com with SMTP id w19-v6so4587421ply.8 for ; Mon, 06 Aug 2018 15:57:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PS1g9GPa4HSLie6iMM5FcZuQF9ox0d0sLaCJltM4uq4=; b=U0uAZ4L3af0nzRnozLpZKvPzEglqDO0P0h8g2wTXlzxx5UhKrF/q8ynCge3390DOYq 2q0lydciGWbY+K6Hz8cQ4LSYMmI3wtHj7mv03rASflW+3D5qWKwM09WR9Fm2+NLIBFjD 4NWlBG+Ej4GGBFi/JMJvt+TgcrjrUx+FPmahNHZW4wFRmkxfHGzTId0OhAt4HNUTxDtE HGqyJot1Q0/o3jmylNRoLsPfPA56QY/N0os3qoy1SoST/s360MYhVQDPC0JjsGd6+QOR FUJGrxvvplIqyONb4K2vI4GsW892hDfiftfqj9ZGaCarcKBeJ9PdpjwhBBI1t6edfcHI NfEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PS1g9GPa4HSLie6iMM5FcZuQF9ox0d0sLaCJltM4uq4=; b=W/K8A+lJLArNvWsdLgaj5HBRGqW1QGOOl+EqUGbq4Z14Lvq2KPv2YLq0BlXBWqVKr5 uBiMXIbiT4KyneRAWEhiADrN8Sd9qW7aXCAcNGh7WIT08gk94AW1Uma2th7Qr2UuZIH3 70rJn8wK3nz1mDbawB0S95EdxMJ/Ib0nemCH7NXLuJbb/sKyM2sgsOhoOyf5ZCyYwF/l Jg0aKKQNtoa8S4HR5o4GqhUPgrshvG7THMJqn1Ne3h4Ps4/u98ndHhtihlBLEyHGVP0K JAJXiMeNWsxob1blyj2NFZjxoxGgkGntL+zE7yDmypy+jIQ4KtqvT63h5rWUha/FZxAA KDxQ== X-Gm-Message-State: AOUpUlEIQMbPzFRPlZYdaEndHVXB16TJqS15oSz2W/Nh5UoSTm01ZbFI o96Qr59kRpvrnK2Sz1f0YbdGLK9V X-Received: by 2002:a17:902:290a:: with SMTP id g10-v6mr15527055plb.110.1533596262124; Mon, 06 Aug 2018 15:57:42 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:41 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:11 -0700 Message-Id: <0872912754137df00107c4736b6bf7bea80fdd34.1533595822.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [OE-core] [PATCH 14/18] libxcrypt: Provide virtual/crypt for target and native as well X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org virtual/crypt for musl will come from libc itself Signed-off-by: Khem Raj --- meta/conf/distro/include/tclibc-musl.inc | 1 + meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/conf/distro/include/tclibc-musl.inc b/meta/conf/distro/include/tclibc-musl.inc index 052ae0e23b..8badbbb40a 100644 --- a/meta/conf/distro/include/tclibc-musl.inc +++ b/meta/conf/distro/include/tclibc-musl.inc @@ -9,6 +9,7 @@ LIBCOVERRIDE = ":libc-musl" PREFERRED_PROVIDER_virtual/libc ?= "musl" PREFERRED_PROVIDER_virtual/libiconv ?= "musl" PREFERRED_PROVIDER_virtual/libintl ?= "musl" +PREFERRED_PROVIDER_virtual/crypt ?= "musl" PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc" PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb index 6ed67a6761..f21029cdad 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb +++ b/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb @@ -24,9 +24,4 @@ S = "${WORKDIR}/git" BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE} -std=gnu99" TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}" -python () { - if not bb.data.inherits_class('nativesdk', d): - raise bb.parse.SkipRecipe("Recipe only applies in nativesdk case for now") -} - BBCLASSEXTEND = "nativesdk" From patchwork Mon Aug 6 22:57:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143543 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3807302ljj; Mon, 6 Aug 2018 15:59:12 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfGtZ4kYWyCuJUZPV1G0dJlA8CBTrIH7KyychY9mI5rEG/F57Vqutk7EcMF0eagocAouKw8 X-Received: by 2002:a63:4b5a:: with SMTP id k26-v6mr15745926pgl.384.1533596352788; Mon, 06 Aug 2018 15:59:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596352; cv=none; d=google.com; s=arc-20160816; b=afvjRtycDTw4LJSj4oRBgJNi6aIpQMhkddEQDP6d5Fx5aHQjqCOTrW51bESXRAlQed rz6WoiiPM8tMxw9nG7kb1Ydbb4QoeRMtQ3Q+FUd4UjvDpVsHF8Z/fBPDiDx+Jwne5OYx 5j2LFRHcDYkmHGW9tMYiTDq/RGpCJoKbTk/ZVVE+r8VO5BCRmiuEwuTMatT07UVAvPcs jxGPw2ezPD+fidWFEk2l1Ai9zwaoRqwohaDWc90yFkJaaNvK34mQxnF6GpS540Bcl5l7 UpmVjPFUW4Trm2l114kQ1GHZ3UasL2rfW2GXniuNJzUqwnVbi9TDfp8JVPM6u2ObInoq UsNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=fIJOcvbg/zmATNTrf6CR2CIkeTofmpnJDrfu3ZqyKkw=; b=vySg5ZRERuUcEFYrQgMaeFbVb3WB23rlAftHvO6kiX3cmFLxeTsOYcjT6uGEqs0LAk vfah6NJXXVVZ86oBcV5KAi1GZs4FyujiuyNZANeV6bqYhvGDHhXKmACiAJsXU30W4io1 AbBSfGnb+zazIj8IU2Gvb9DiqeQlTc9OwRwPeAd7lMjhw94Rmt+TTdwL4LhV/V0kcUsN dBAKxG9/ScB+4vfZqUGUswQIXEQN+qLOK2mmck3HOlS+8jyoT5ish7rOFbJWdjlqdx1m tUL5ZRDLeGLzobrQBPVO4EKvJSl5gJsBxMw+rMIqQEfnQvcRmhz7arDOF1Ue+FWhDu2Q CWUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gZ1XlNbU; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id r9-v6si10433996plo.338.2018.08.06.15.59.12; Mon, 06 Aug 2018 15:59:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gZ1XlNbU; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 878B578BE0; Mon, 6 Aug 2018 22:57:58 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f41.google.com (mail-pl0-f41.google.com [209.85.160.41]) by mail.openembedded.org (Postfix) with ESMTP id 7AE3B78A74 for ; Mon, 6 Aug 2018 22:57:42 +0000 (UTC) Received: by mail-pl0-f41.google.com with SMTP id u11-v6so6249276plq.5 for ; Mon, 06 Aug 2018 15:57:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DBmC8ou89+m0ZJlQ7MZ9eNMkVgtSUXtmApSSrrcSVuY=; b=gZ1XlNbU1JhjbZLftcmBcsNVSfDyraHv1GoNMeUhjviMX/MTj40Gkx3LCVrARMkK3T iLUihyXguhA6966DumSQ8wgyflop5mwUbnIhqV7YZH26G5lForndU6preu+Gv+3sSkcw JlPecFzFYoxw0vxISBWWPPY+sUVi6iWZnAdR+iCrsxOrt7BD/G+NEnb0OYCYsESYbXaI GxR07lISyFZ51E1RB3lSJqR9udMd8J1hVAHliByJMk2mNUAMrsd/Yo6jvlS/E0LhMc61 ASp3fZ8NB0z+97pD7Q30dHVuejdsWR81j7fumO43AB/7xOOuI0MEQfSXoqkep9MBnwJg +S/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DBmC8ou89+m0ZJlQ7MZ9eNMkVgtSUXtmApSSrrcSVuY=; b=GOLp+a8/5eSCyn7gkPDIuwnwLqW/9+e5Xj3TmAhrvjQOjoiFgIMsj5AaJTOoy17LcJ X0TXtuksEc2UJUBCI8VZWmaCofHz6ncwbzzd9hnqWBd9d9FdT1BGuCFcb0914n6+0QBX cl8oIBEH0NmtQ2YWPAplwPmmOF45zUYugCbIhlU/aocaC+8cRNaO+Ao8YKL0Us9Sm8JQ q1Acg7Exd2hqFLG2a+FMY64dW6emodDk9bvXCyjuLv/hjhhktUyoVSaXzl/LcTHSUKBi c/vPudgPvB6Bmhrn7QuqZjxlPPQphFmA5OGSdKd+bDbGT9GskpL3JAIaHrFupZcomOuA tHjQ== X-Gm-Message-State: AOUpUlEiU325Yg3M4BX0hXp/1M3rgC+mWzldmANaD+ROdGU3c/+oERBP Zy24JVZJxdniTjTptY0AMsqF1N/7 X-Received: by 2002:a17:902:7e06:: with SMTP id b6-v6mr15442598plm.230.1533596263242; Mon, 06 Aug 2018 15:57:43 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:42 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:12 -0700 Message-Id: X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [OE-core] [PATCH 15/18] libxcrypt: Upgrade to 4.1.1 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org license update: Remove CDDL code with Public Domain pieces https://github.com/besser82/libxcrypt/commit/c76847e3be40c4ac0d78bc8518502418c6207144#diff-fdcb2380ff1eeea2e5795ec115ba1c0d inherit pkgconfig as it uses pkg-config during build Signed-off-by: Khem Raj --- .../libxcrypt/{libxcrypt_4.0.1.bb => libxcrypt_4.1.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-core/libxcrypt/{libxcrypt_4.0.1.bb => libxcrypt_4.1.1.bb} (81%) -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.1.1.bb similarity index 81% rename from meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb rename to meta/recipes-core/libxcrypt/libxcrypt_4.1.1.bb index f21029cdad..61ea22e4ea 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb +++ b/meta/recipes-core/libxcrypt/libxcrypt_4.1.1.bb @@ -3,13 +3,13 @@ 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=d1cc18f512ded3bd6000f3729f31be08 \ +LIC_FILES_CHKSUM ?= "file://LICENSING;md5=cb3ca4cabd2447a37bf186fad6f79852 \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ " -inherit autotools +inherit autotools pkgconfig -SRCREV ?= "089479bb24acd168613757a6f12d63caa95416b4" +SRCREV ?= "21b455b68baad279e6a3936faced16c5e5634376" SRCBRANCH ?= "master" SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH} \ From patchwork Mon Aug 6 22:57:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143544 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3807382ljj; Mon, 6 Aug 2018 15:59:18 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe1YNAANb0s0idMhJiLyn/okZPx3TZM+FVzJL7+QbTXe2ukfHRWL0FJXNTbiM6TPfV9vP6V X-Received: by 2002:a62:249c:: with SMTP id k28-v6mr11438379pfk.195.1533596358839; Mon, 06 Aug 2018 15:59:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596358; cv=none; d=google.com; s=arc-20160816; b=ORHhLpMg56b6knrIyL1LECWB2B8ao232W5yJ2sSrLdQXhMcC48oq1juZB/oz7u09oO W+QWUM7UY4Ihy9ZsKy5XbMW7oWHzDOoaoNTMfnw7pj07oOQvAMsodycQk6BdU0ufgog+ g0pBydq3vi+mFvNYVrL5xLIR9SM+KSeBoHS/OPZBisIEXe9shAUFz2QEPAJVRJvVecIu xu/xnAYxSzYhf11nPN+ELGgL1s7NaDzca2Gv2nWb8VWaYLtz7izvAiYotunWzJNkbkC0 qpQ27e6MsoVtlxNbhOnkH4g96A66pRqCwAK0L28WD2l3wE88kJDX2hwpOgIvZ5cDUz8T WdBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=zmh13tJkhd+050UxVSbO1wox8rvJcEXaBzHCtA3O1IQ=; b=m3JyU9QEZr0eJHOXHJCULm2IAXpsMQttGU4Wn5PNU7ODhX+1cZ7UKTzeVQ/pAvlYHq hUxc540mZG82JIJnNJ4y0q7FF3JZ7YBKJuzPOaLMzgsXcgTFY9mQH6Sideyp8VB8YJtz S2v5E9x9aLNmg0HuZq06oXuje27afmVESzvkjH4Pelap+5uRisYkJ5A5+nbIYxZx0mdS erZLnkyIQlvEvHC9Alg6NbApugiff0WgKFbMz3gh5P6yw1+4OGV+JLRUczTuYQVUJg1A 6ei312YmjpMB6vU6ylg3hYMaLFWbEY4WMPTEwYa5hBvkK4h59QE7vioA2PRxRAb2i28N lj5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tCB0T1Iu; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id m23-v6si13712692pgb.420.2018.08.06.15.59.18; Mon, 06 Aug 2018 15:59:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tCB0T1Iu; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9F87F78CB0; Mon, 6 Aug 2018 22:57:59 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f46.google.com (mail-pl0-f46.google.com [209.85.160.46]) by mail.openembedded.org (Postfix) with ESMTP id 7182C78BF5 for ; Mon, 6 Aug 2018 22:57:43 +0000 (UTC) Received: by mail-pl0-f46.google.com with SMTP id f6-v6so6250665plo.1 for ; Mon, 06 Aug 2018 15:57:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xqZoWAcpZ2/Zg7wEVg1dgya9WLpijnFSV3FLRuxyybo=; b=tCB0T1Iu/Xcu7/a2jsKWWS8kLTr7ELBWwZPaIbjpDWWwIGIf3PRy2fs3sFpKlVvyNV VO3o8W1PxOTLKwXmIJJFOKVA2nBuVV3Csy3wIVTU+PZWQ85pFoEKgQ3pb1IQFl5g4sUR 8iv3F7lGej5s93Y7iFTCez3JGRXKPFkwL1OCSXLeWi8sLy3OpomlXHftu3Ad1FaPvr9t 0M64GO6Nee5Zx3lvW8mZUVQKuTcWnLnqNC92gEtLF7a+BR+CKi6DAvUigeS1xOKWlVpf 1r9U55dbFkUgsAdB0Dfccf2F+gP0OdQH092fzfVbGa+E3XFWi45YfRi9xsFpi/x1x6gE EglQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xqZoWAcpZ2/Zg7wEVg1dgya9WLpijnFSV3FLRuxyybo=; b=g3serelXn/le6Z+zPRkAFOwT84fbfo5V/PqUl65JD/3DkuDZunXe9hXzYIsgtliZ3w 0fq/Wrc8wSgw5RtBZNAe6LICmbQqRq8dCcMOFAbu3OBWBWZFIh/eN1U8Yk5R9/WVhpsR L0DlYEJ7s3LtiKc8SpCS46gnTwOU3L/fkuwp5Ew8qZWm8QxfQy1IzES2AW3m5WogkGbT aue/bxzyrY27ui21kVoRXCRGk2ErD+JSHASCsDQry8EXkyIbq9vm1E43egSshY5r4DYz q/iSFJNvB/nZ+SYgePuALNw9E5zjeppxXCe5G3nPf3z7A7FK/Pbny4EHAQEc42b5fBDT VxGg== X-Gm-Message-State: AOUpUlHBElpGafqvTR20L7c10ETx7EDA/iiUwCXJWGRcHfNpw/RJ0GWc i6GclsVfSwbjAASZoRwvClJmEnAI X-Received: by 2002:a17:902:1682:: with SMTP id h2-v6mr15564800plh.327.1533596264301; Mon, 06 Aug 2018 15:57:44 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:43 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:13 -0700 Message-Id: <72fb0632bf135adce312be8b9c1c8813bf967372.1533595822.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [OE-core] [PATCH 16/18] cross-localedef-native: Update to build with glibc 2.28 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- meta/recipes-core/glibc/cross-localedef-native_2.28.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.28.bb b/meta/recipes-core/glibc/cross-localedef-native_2.28.bb index 0992e0285d..a05b94e3b3 100644 --- a/meta/recipes-core/glibc/cross-localedef-native_2.28.bb +++ b/meta/recipes-core/glibc/cross-localedef-native_2.28.bb @@ -22,7 +22,7 @@ GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+(\.(?!90)\d+)*)" SRCREV_glibc ?= "3c03baca37fdcb52c3881e653ca392bba7a99c2b" -SRCREV_localedef ?= "de5bdbd5e76b5403a4151b9b9f958b6cca36b3e7" +SRCREV_localedef ?= "c328777219ccc480be3112cf807217ca6b570b64" SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \ From patchwork Mon Aug 6 22:57:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143545 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3807451ljj; Mon, 6 Aug 2018 15:59:25 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf0JF2g2w1EUQyCOuPqbd75SbQEfjichXphCejLYxKGKYMZLn4a60Q3phMhKwBmpAIn08wR X-Received: by 2002:a63:1262:: with SMTP id 34-v6mr16615986pgs.154.1533596364923; Mon, 06 Aug 2018 15:59:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596364; cv=none; d=google.com; s=arc-20160816; b=lg6x2q3EuN0sHZZnJp4BOjZ1ex8BpLiS7FNYiPALAnYwq5QsImoLZfcaAhNFwvtsvd Ecc0KD95BhU7vMJUXMXGZ52YN1DrmlOvwIlEht8x/ERaUpgsQPPtVkeZk7GWyagThq/z 4jrAHkkdcwzrn9vh5HkMfF59jCRLsSQQknTLBN+VEJRYj0ZtYOBXHrc7SYBbZiOjFhXx cffkKXoSCrgwtLrKYXWqCBV9SFeaWCUcDqf99TxBjxaY7b5djhVpk26oY3BMa6+nfks6 iwZcRVprq1x85O35cA4E1uqN1y/t77CFmNjy3O2rqbV65Yh67NcXymU+Qd93/a+n4ctI OMaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=j87u9XhWpMZVeVjcWxaewIwHLrgyykwl/HCM//maCHQ=; b=mA9JqIVjmJ+v9xBlQon1aDezps1nl9lGaQZW6xnCsjLqt6k+O1nV6xK+xXUBO1qgv6 j2hO/40lgGmZKs5bWB2fR27VQhcO7TOpxWG9MlbXywVRab0BaiHwKfy0Wda6XGZYSIQN LTKabZxbLRARMjyAPok3N3F8FNH6VpIwcVARpU1PVmBJpQU4Fjpx6ztSBhcHB56rgNLR 9/vU/R/6slyWS+thqM4Fu7rRJkH5w6qMlHlk7bvFy4a2dRqrplsHXwohdJqE1id0Dk/z YwYY8ywTMlsM1MHUCYOCesmrSCOc12QF5iWo7HOsyoB4TKNAbzGnQ1dh4zi79s/X2URV Dz0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=foMO0IJ0; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id d3-v6si13910323pgk.610.2018.08.06.15.59.24; Mon, 06 Aug 2018 15:59:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=foMO0IJ0; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id B4B4C78BF8; Mon, 6 Aug 2018 22:58:00 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f45.google.com (mail-pl0-f45.google.com [209.85.160.45]) by mail.openembedded.org (Postfix) with ESMTP id C1A8A78BFA for ; Mon, 6 Aug 2018 22:57:44 +0000 (UTC) Received: by mail-pl0-f45.google.com with SMTP id w19-v6so4587471ply.8 for ; Mon, 06 Aug 2018 15:57:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1FwelgiQS6+aCDDdMzoi3yrzRNE7f6u+y8MwpDcvHE4=; b=foMO0IJ0CYKEEwMS4au+/jgbLWHSRfPnCxUt+zaAYPtLdoGwCvjfwdkxegQnBIBeik /JGdmWE3YpFNl2oIJjJw74eli+SPoU7p82Y7mfh6jlPfq4OXtnFO8mWJ3mwnP1RHZFMn d+54uG1rkgz1pjc+BZ73/Vyq6UPJhiWX7+X9tCnmZuWISHjfmnMB7YyeM0xUqGjbIyXh bzx4sif73JFyMY3jN8dyeXa1dQW+o3C4x2ewF/Prg0t4VyE79zWVtwoPTdHAeDvg9fW5 hS2eXUvBYTIzfPtEww/BHlyrwyGJDf0c05SK5Mv8DGCgpNwhzFzOO3/9uAs5qDo+Ol0Q mfWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1FwelgiQS6+aCDDdMzoi3yrzRNE7f6u+y8MwpDcvHE4=; b=m9RKwQKCY2+lWdSJ57bxwZDgamlEaeArYFk0wfSIu2OV2jMW77x1XAnyQKKZ464k7C EM8jhLfzWdfeoDdinjnfCsmM+pAPoqf1zgGoxa0R9wvJPWExY6/6Kwd85OHc6KvHPa2C qUJ5THf4A4ZvJpzWCdvOzOLYGd3u06yRjkvDu5wPbwPtaZR4IXAuzFzs2r8ADrV1LYbl gFX8V5/zufT5bsZxSLTr7w8vOITa5Kxvdc8AzajvOi7QndN1MuwmV7aX5CX4i6/VRIz9 hlmWzqWrJjLUJIjcq4oqerhTDAnJ0iQ7jbVRQWsAiWJEVorjol60dDu96SZKrHtQz22f nV9w== X-Gm-Message-State: AOUpUlEtzbb6oDbliNOnvh0aHH5GTWzaPQrIj5l0k6ZIBdkyW6XkqXWP 5mLyrIM/r10p9WLhwNKnZ6IHuLX2 X-Received: by 2002:a17:902:8d91:: with SMTP id v17-v6mr15748805plo.9.1533596265551; Mon, 06 Aug 2018 15:57:45 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:44 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:14 -0700 Message-Id: <8c076c9eca8acdb757248576ffd0434a97048b17.1533595822.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [OE-core] [PATCH 17/18] ppp, libpam: Add missing dep on virtual/crypt X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 2 +- meta/recipes-extended/pam/libpam_1.3.0.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index f4646bd693..644cde4562 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -4,7 +4,7 @@ the Point-to-Point Protocol (PPP) on Linux and Solaris systems." SECTION = "console/network" HOMEPAGE = "http://samba.org/ppp/" BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs" -DEPENDS = "libpcap openssl" +DEPENDS = "libpcap openssl virtual/crypt" LICENSE = "BSD & GPLv2+ & LGPLv2+ & PD" LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \ file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ diff --git a/meta/recipes-extended/pam/libpam_1.3.0.bb b/meta/recipes-extended/pam/libpam_1.3.0.bb index 92ab72a42f..3aec2cdb4c 100644 --- a/meta/recipes-extended/pam/libpam_1.3.0.bb +++ b/meta/recipes-extended/pam/libpam_1.3.0.bb @@ -32,7 +32,7 @@ SRC_URI_append_libc-musl = " file://0001-Add-support-for-defining-missing-funcit file://include_paths_header.patch \ " -DEPENDS = "bison-native flex flex-native cracklib libxml2-native" +DEPENDS = "bison-native flex flex-native cracklib libxml2-native virtual/crypt" EXTRA_OECONF = "--with-db-uniquename=_pam \ --includedir=${includedir}/security \ From patchwork Mon Aug 6 22:57:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143546 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3807496ljj; Mon, 6 Aug 2018 15:59:31 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdXOBhuvhA3PvBk0n7pszqlh3lnIuP32S3X1S8qFGJ71poor9OA8prqsxRw9wXJs2iLLydw X-Received: by 2002:a62:50ca:: with SMTP id g71-v6mr1067069pfj.244.1533596370891; Mon, 06 Aug 2018 15:59:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596370; cv=none; d=google.com; s=arc-20160816; b=A0RKztTmVOmCruVXTlyJJEl8dTFUz/hr4pGb+eKSDJQvX/Z1rtKMirN8bjDb1xJTt1 mfHGkgHce1R5dfJAQqVCxjNvgHlq9zpRx2q2CN30PNCksfEL2MdQFwb+aHhNJXKniXC1 zRmA5L/8LQ3cmuDGCTztd6mFNyg99+/XIoAmNxq4ACK3Niffy4zmvf5VSOs7XlWRk7Au bNadk3fNBMzv2UqttVjhCriX+KTpPf8qCtQl3CuV1GI7ELT0XdV3EEcuYpB7YhRVTl7y 7zpmXBnD4r8SZ9tIH+756GI5HoZJVUJhs3LiW96TiEzgBl9yBbIRKJARbC3+y45k7tG8 /Nzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=oZ0kGHoD7Hx/iRz8yv3HKC04eUbpHhtq8gx0So5Ki7Q=; b=Bs+JLJZ4uiZN/QpKVrMXyP0YQWB3HdThd6AtJlSX4pRjfNRVutQE3oLSiUXp5ta9GL exd7Lfqp4l6D6NRAXEqZnOoxgji/vTZa+mEebMCPxcpo91TTClpZVW3qaKsPfzhYPl9E IoVV38s2Mb4qNhm2EMcZrvZxhliFmpyzu57q6l4fBRC+iIvNyL1xNuglbcuCCIDcBF2S 2IOcuuEJ4z5YzQQXuscDTwxYNxo5fBElYLjDpjlbi7/3kI3GCYYZtA9BUWx4pajUypjV 17Phl2cvWUROnpcFUxBXVLYXNDIoFeXOsZou/w2oEjQtFowiDSC+JUibluSWDxzicRhE q2Bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eAzH7IiR; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a13-v6si14337049pgj.495.2018.08.06.15.59.30; Mon, 06 Aug 2018 15:59:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eAzH7IiR; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id CE6F678CBA; Mon, 6 Aug 2018 22:58:01 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f42.google.com (mail-pl0-f42.google.com [209.85.160.42]) by mail.openembedded.org (Postfix) with ESMTP id 38B7778BDE for ; Mon, 6 Aug 2018 22:57:45 +0000 (UTC) Received: by mail-pl0-f42.google.com with SMTP id w19-v6so4587498ply.8 for ; Mon, 06 Aug 2018 15:57:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=E7VFSq1EoOQ2NT4EPGLbIbbo7tlrOOvFeHSTu0lO9jo=; b=eAzH7IiRbXomGA9u4YvjrYnaay9laD/DpT/nuLR+zTmO2CXfSt+ZP3Cjra4HizVl3n v5h2SPAww3zqUJVsAQcqtoBLdoJRMPIbEcVUuPhRj8fnHYioFipgM4NxXov6C+A7pThV 4fT0U5m4OPobVcFlsWrDlWK3mHRnHwTYv27CbaJGRskufb+KauDzq/sJSIdNMxoY9L3s q0ENoQPV1QRjuLucwD5u0VaQ3ZXFZHpd7spN9Y5734RrFKa0vh/mQ4Me5bPBJKlwU87e sLnRUT653UQfTc5PYrRKTa7y4dnpRwRRj23weOLhFWAa+9T3/R07db6A0o7/ZRP81PTc 2KAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=E7VFSq1EoOQ2NT4EPGLbIbbo7tlrOOvFeHSTu0lO9jo=; b=Da6GEUhvZTEhbQauSwfACw+0qQ5PDSYF58+4oqagNsHLc+eJcCpyoKXnaUC8VS9tLp OxQY1MbH2tk57CtNpdKOR6g2v4gDbgKS7xu7j1/WjLj4fgmMTWSSR3BQsV+2yFS5d0lU 92PlcKWCZvmVaLdjG6Wbqh093OgBQWS0X882EhYVnd4FgBHY2sGfxzbVDIxMi2+PuCwi xBujPf4J7eMjO0RvCWsH6FxfyZs/O0RBuesetbR7PqUM9kRoKeYDU1D8QVaDHIZMNAQ6 yy99UfR2rqY0pt4oPOLCFZ6E7BbnyxK+bpZzAz76d67rWL//AAuELS3zFZcLDcVmeWZc sIrQ== X-Gm-Message-State: AOUpUlHo/8EtFsSnYD+GtC/ViyF3naQuvkVkdrgSqQT/ysQwoEZe1rUU uMixctzRsJaEsEr5gyl9ocX2Lrr8 X-Received: by 2002:a17:902:9687:: with SMTP id n7-v6mr15182627plp.33.1533596266874; Mon, 06 Aug 2018 15:57:46 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:46 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:15 -0700 Message-Id: X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [OE-core] [PATCH 18/18] sysvinit: Fix build with glibc 2.28 + libxcrypt X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...acros.h-for-major-minor-defines-in-g.patch | 71 +++++++++++++++++++ .../recipes-core/sysvinit/sysvinit_2.88dsf.bb | 3 +- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/sysvinit/sysvinit-2.88dsf/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/sysvinit/sysvinit-2.88dsf/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch b/meta/recipes-core/sysvinit/sysvinit-2.88dsf/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch new file mode 100644 index 0000000000..2575b59b5e --- /dev/null +++ b/meta/recipes-core/sysvinit/sysvinit-2.88dsf/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch @@ -0,0 +1,71 @@ +From 29c7a529d3bb0c1e20239f885e74c5036f1a908c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 6 Aug 2018 15:38:58 -0700 +Subject: [PATCH] include sys/sysmacros.h for major/minor defines in glibc + +Signed-off-by: Khem Raj +Upstream-Status: Pending +--- + src/bootlogd.c | 3 +++ + src/bootlogd.o | Bin 58448 -> 60376 bytes + src/dowall.c | 3 +++ + src/shutdown.c | 4 +++- + 4 files changed, 9 insertions(+), 1 deletion(-) + +Index: sysvinit-2.88dsf/src/bootlogd.c +=================================================================== +--- sysvinit-2.88dsf.orig/src/bootlogd.c ++++ sysvinit-2.88dsf/src/bootlogd.c +@@ -53,6 +53,9 @@ + #ifdef __linux__ + #include + #endif ++#ifdef __GLIBC__ ++#include ++#endif + + char *Version = "@(#) bootlogd 2.86 03-Jun-2004 miquels@cistron.nl"; + +Index: sysvinit-2.88dsf/src/dowall.c +=================================================================== +--- sysvinit-2.88dsf.orig/src/dowall.c ++++ sysvinit-2.88dsf/src/dowall.c +@@ -37,6 +37,9 @@ + #include + #include + #include ++#ifdef __GLIBC__ ++#include ++#endif + + #ifndef _PATH_DEV + # define _PATH_DEV "/dev/" +Index: sysvinit-2.88dsf/src/shutdown.c +=================================================================== +--- sysvinit-2.88dsf.orig/src/shutdown.c ++++ sysvinit-2.88dsf/src/shutdown.c +@@ -57,7 +57,9 @@ + #include "reboot.h" + #include "initreq.h" + #include "init.h" +- ++#ifdef __GLIBC__ ++#include ++#endif + + char *Version = "@(#) shutdown 2.86-1 31-Jul-2004 miquels@cistron.nl"; + +Index: sysvinit-2.88dsf/src/mountpoint.c +=================================================================== +--- sysvinit-2.88dsf.orig/src/mountpoint.c ++++ sysvinit-2.88dsf/src/mountpoint.c +@@ -32,6 +32,9 @@ + #include + #include + #include ++#ifdef __GLIBC__ ++#include ++#endif + + int dostat(char *path, struct stat *st, int do_lstat, int quiet) + { diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb index ad65819b2d..a21e7e46f7 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb @@ -15,6 +15,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.bz2 \ file://pidof-add-m-option.patch \ file://0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch \ file://realpath.patch \ + file://0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch \ file://rcS-default \ file://rc \ file://rcS \ @@ -29,7 +30,7 @@ S = "${WORKDIR}/sysvinit-${PV}" B = "${S}/src" inherit update-alternatives distro_features_check -DEPENDS_append = " update-rc.d-native base-passwd" +DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" REQUIRED_DISTRO_FEATURES = "sysvinit"