From patchwork Thu Jan 3 18:07:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 154731 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp931653ljp; Thu, 3 Jan 2019 10:08:27 -0800 (PST) X-Google-Smtp-Source: ALg8bN7TknWcCFGIRzCEhKqs+1l5vqvE/h76odE1h2RGY/I1OILY2pFA8MX0dQStX8iGrtoIEweC X-Received: by 2002:a63:7418:: with SMTP id p24mr18027900pgc.196.1546538907698; Thu, 03 Jan 2019 10:08:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546538907; cv=none; d=google.com; s=arc-20160816; b=oUxPLPMerKLubJ+JT9KF8+8jOH8CHD/dEiSvL80AotLqUPXaPruX9BmLZw3TMCoZf7 spgu0UjnNRYyKkuRw3Iel12Te9hnrbVT3/CHZrhLUUH/xAtTwsLgAdNIMleub1WOBXdV 9jL1KQg8qesQH6nHQONJ0t5qIgfQHUxrVT3cStcKnpytz9bjcZjH7SQWlICRYkCcrrpA vWqkAlrSD5TXfao5d0Gn3r+iAAMD2QbaR55iC/2TsznN83apeBS5ErTHzhUe1bEHxZe9 TaHX3xuV4zpwmZVoPgeMHCEqbJSx/zE0XriulirH4dB00UJD1Yt5qkqJOxXwdDlb7OJz 8JxA== 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:message-id:date:to:from:dkim-signature:delivered-to; bh=FUu6eAW2oo2Ry10Rh7VvOLpAfdT6QUm+ma2WvDdT9Bo=; b=P/wqjkqVfnA5rV2toBu/RWJ9QE/F1GZSuHbIB8rcgl82fJtSLn4PegQXPpQQ3udSTI 3+XYdg8OakgBRTiJjp578KUTHQ03lulinF33PSRUsmxZH+92j4yl2xI73usl5FXItt6j 7Vesipybo6zNT12iWt7RuTP7A6ldnPXKBK42EKv95yeRapzK/EBrPqFq1cJKlEubrXxp +u3vUTcGgwfsuQpHCniQC1xzGB8SQ0j3F6VvrYNVFR1GJbj7UN2UNQ2EAPuFw53xLkE5 yy9A+ZlxunDgYeZzdK8IP2qTbmffOT9KilsZ6DxWGKOBecZhjCE9mlRGwnBXKAW16E/0 oCiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=YdvBEqwP; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 w23si50261543plq.198.2019.01.03.10.08.27; Thu, 03 Jan 2019 10:08:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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=YdvBEqwP; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 706AC79CB1; Thu, 3 Jan 2019 18:08:24 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@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 51B107503B for ; Thu, 3 Jan 2019 18:07:59 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id u6so17015591pfh.11 for ; Thu, 03 Jan 2019 10:08:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qjw3032qnASckcOqmpcfcm4jz46nJSBKtcbTBjqZSKw=; b=YdvBEqwPmgmYS1BSTRzg69gekyeD+h+SCaOhssSDUEESSq7ix2ffsgnPoG/yeZ9uYS HPmImHJ1xz4tN6SSqrAOMdZ4WKRD6Pxqr+rXnqRjSKG+bQpGuX+teenV/PevsXRWP21Z o9fNdOHRtLutqfFqCCyGIEZk+mAWbmZDv6Bk7bva7oIjzY6wPq9qjuoqO35UdPVKmv2k zy+0OGGXmxv0/YurlLekRyO/dxoZdrRW4L/lpa1L2DQJ8uA97pMXiE0JKj44/GS5BzfN Ml4kYNWDrki2jfGSZK2O/Ro4azcqMsERX2qVOGiuDWXc9WmffuajzXsKzjXjCbfQVqvy meaw== 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:mime-version :content-transfer-encoding; bh=qjw3032qnASckcOqmpcfcm4jz46nJSBKtcbTBjqZSKw=; b=Bn2hn3uSkBjCrwXarRj+WqPtWgr6TPbnNlpG0KjBKkwb7JWKMpK8DQEVRsQaC+L9SK 1iPzgr87C+tT5Y0t3X+g07WenGdOOMw9ehggNilKhsbOJU6yCLk4aAd/KuHbBoxve52z VXT/HyJYeCntDn1ietETwXYk/fcKDtp2XSfGDro57FLRsFlXZDBvYRj3gQf68gJf2fIS t7NcqNRYUVF7p9fPyXrwBhXKX0433oz2lqAEV7DWzf8EUZIWLILn56edt9qFzPOG12x5 6Iex1JPvVpJv2R9XmzZSJpj4hEy+sPQkA0I2YrA4WeYrAvg6N0qxU1IGFroedAudQr4v 4lLw== X-Gm-Message-State: AJcUukcdhg/O0yasu07sgI/mzSYU3mFo0WPQ6jmYXFPXLFq5gqD06f/D xbETNhnJ3v8WA29wjjomRHuPTuFJEB0= X-Received: by 2002:a62:64d7:: with SMTP id y206mr9785922pfb.84.1546538879119; Thu, 03 Jan 2019 10:07:59 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:877f:9499::6ee7]) by smtp.gmail.com with ESMTPSA id m67sm75487168pfm.73.2019.01.03.10.07.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Jan 2019 10:07:58 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 3 Jan 2019 10:07:49 -0800 Message-Id: <20190103180751.24958-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 1/3] start-stop-daemon: Upgrade to 1.18.25 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Import patches from oe-core to fix build for mips64 Signed-off-by: Khem Raj --- .../0001-Add-linux-musleabi-to-ostable.patch | 39 --------- .../0001-dpkg-Support-muslx32-build.patch | 41 +++++++++ ...rs-kernel-version-which-has-characte.patch | 38 ++++++++ ...s-expect-D-to-be-set-when-running-in.patch | 75 ++++++++++++++++ ...tion-doesn-t-work-properly-for-all-s.patch | 31 +++++++ .../0005-dpkg-compiler.m4-remove-Wvla.patch | 36 ++++++++ ...add-musleabi-to-known-target-tripets.patch | 42 +++++++++ ...c-Remove-usage-of-clamp-mtime-in-tar.patch | 39 +++++++++ .../add_armeb_triplet_entry.patch | 48 ++++++++++ .../start-stop-daemon/arch_pm.patch | 29 +++++++ .../start-stop-daemon/noman.patch | 22 +++++ .../remove-tar-no-timestamp.patch | 17 ++++ .../start-stop-daemon_1.17.25.bb | 39 --------- .../start-stop-daemon_1.18.25.bb | 87 +++++++++++++++++++ 14 files changed, 505 insertions(+), 78 deletions(-) delete mode 100644 meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-Add-linux-musleabi-to-ostable.patch create mode 100644 meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-Support-muslx32-build.patch create mode 100644 meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch create mode 100644 meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch create mode 100644 meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch create mode 100644 meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0005-dpkg-compiler.m4-remove-Wvla.patch create mode 100644 meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0006-add-musleabi-to-known-target-tripets.patch create mode 100644 meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch create mode 100644 meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/add_armeb_triplet_entry.patch create mode 100644 meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/arch_pm.patch create mode 100644 meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/noman.patch create mode 100644 meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/remove-tar-no-timestamp.patch delete mode 100644 meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb create mode 100644 meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.18.25.bb diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-Add-linux-musleabi-to-ostable.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-Add-linux-musleabi-to-ostable.patch deleted file mode 100644 index 269441fc8b..0000000000 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-Add-linux-musleabi-to-ostable.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 087840efdbc86b1432ebdd81f25b4cb78c75f818 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 11 Sep 2018 12:28:10 -0700 -Subject: [PATCH] Add linux-musleabi to ostable - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - ostable | 1 + - triplettable | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/ostable b/ostable -index 3bb6819..d0ffdc7 100644 ---- a/ostable -+++ b/ostable -@@ -15,6 +15,7 @@ - uclibceabi-linux linux-uclibceabi linux[^-]*-uclibceabi - uclibc-linux linux-uclibc linux[^-]*-uclibc - musleabihf-linux linux-musleabihf linux[^-]*-musleabihf -+musleabi-linux linux-musleabi linux[^-]*-musleabi - musl-linux linux-musl linux[^-]*-musl - gnueabihf-linux linux-gnueabihf linux[^-]*-gnueabihf - gnueabi-linux linux-gnueabi linux[^-]*-gnueabi -diff --git a/triplettable b/triplettable -index 7257744..45864c3 100644 ---- a/triplettable -+++ b/triplettable -@@ -6,6 +6,7 @@ - uclibceabi-linux-arm uclibc-linux-armel - uclibc-linux- uclibc-linux- - musleabihf-linux-arm musl-linux-armhf -+musleabi-linux-arm musl-linux-arm - musl-linux- musl-linux- - gnueabihf-linux-arm armhf - gnueabi-linux-arm armel --- -2.18.0 - diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-Support-muslx32-build.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-Support-muslx32-build.patch new file mode 100644 index 0000000000..50e6894406 --- /dev/null +++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-Support-muslx32-build.patch @@ -0,0 +1,41 @@ +From a328c8bec0bf8071ae8f20fee4c7475205064ba1 Mon Sep 17 00:00:00 2001 +From: sweeaun +Date: Sun, 10 Sep 2017 00:14:15 -0700 +Subject: [PATCH] dpkg: Support muslx32 build + +Upstream-Status: Pending. +Changes made on ostable and tupletable to enable muslx32 build. + +Signed-off-by: sweeaun +--- + data/ostable | 1 + + data/tupletable | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/data/ostable b/data/ostable +index be64342..87db273 100644 +--- a/data/ostable ++++ b/data/ostable +@@ -19,6 +19,7 @@ base-uclibc-linux linux-uclibc linux[^-]*-uclibc + eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf + eabi-musl-linux linux-musleabi linux[^-]*-musleabi + base-musl-linux linux-musl linux[^-]*-musl ++x32-musl-linux linux-muslx32 linux[^-]*-muslx32 + eabihf-gnu-linux linux-gnueabihf linux[^-]*-gnueabihf + eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi + abin32-gnu-linux linux-gnuabin32 linux[^-]*-gnuabin32 +diff --git a/data/tupletable b/data/tupletable +index 28f00bf..748ffab 100644 +--- a/data/tupletable ++++ b/data/tupletable +@@ -10,6 +10,7 @@ base-uclibc-linux- uclibc-linux- + eabihf-musl-linux-arm musl-linux-armhf + eabi-musl-linux-arm musl-linux-armel + base-musl-linux- musl-linux- ++x32-musl-linux-amd64 x32 + ilp32-gnu-linux-arm64 arm64ilp32 + eabihf-gnu-linux-arm armhf + eabi-gnu-linux-arm armel +-- +2.7.4 + diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch new file mode 100644 index 0000000000..9fe0ca7600 --- /dev/null +++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch @@ -0,0 +1,38 @@ +From b4ea54158c399874e12394ebc91afe98954695e2 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 26 Aug 2015 16:16:16 +0300 +Subject: [PATCH 2/5] Adapt to linux-wrs kernel version, which has character + '_' inside. Remove the first-char-digit-check (as the 1.15.8.5 version does). + +Signed-off-by: Dongxiao Xu +Signed-off-by: Constantin Musca + +Upstream-Status: Inappropriate [embedded specific] +--- + lib/dpkg/parsehelp.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c +index 453077fd9..f42ea2882 100644 +--- a/lib/dpkg/parsehelp.c ++++ b/lib/dpkg/parsehelp.c +@@ -243,14 +243,12 @@ parseversion(struct dpkg_version *rversion, const char *string, + ptr = rversion->version; + if (!*ptr) + return dpkg_put_error(err, _("version number is empty")); +- if (*ptr && !c_isdigit(*ptr++)) +- return dpkg_put_warn(err, _("version number does not start with digit")); + for (; *ptr; ptr++) { +- if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~:", *ptr) == NULL) ++ if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~:_", *ptr) == NULL) + return dpkg_put_warn(err, _("invalid character in version number")); + } + for (ptr = rversion->revision; *ptr; ptr++) { +- if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".+~", *ptr) == NULL) ++ if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~_", *ptr) == NULL) + return dpkg_put_warn(err, _("invalid character in revision number")); + } + + +-- +2.11.0 diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch new file mode 100644 index 0000000000..93d870443c --- /dev/null +++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch @@ -0,0 +1,75 @@ +From 24229971492515b64c81e8c6392e5dfbdc22b44c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 26 Aug 2015 16:25:45 +0300 +Subject: [PATCH 3/5] Our pre/postinsts expect $D to be set when running in a + sysroot and don't expect a chroot. This matches up our system expectations + with what dpkg does. + +Upstream-Status: Inappropriate [OE Specific] + +RP 2011/12/07 +ALIMON 2016/05/26 +ALIMON 2017/02/21 +--- + src/script.c | 44 +++----------------------------------------- + 1 file changed, 3 insertions(+), 41 deletions(-) + +diff --git a/src/script.c b/src/script.c +index 2f252ae..768a9d1 100644 +--- a/src/script.c ++++ b/src/script.c +@@ -97,48 +97,10 @@ setexecute(const char *path, struct stat *stab) + static const char * + maintscript_pre_exec(struct command *cmd) + { +- const char *admindir = dpkg_db_get_dir(); +- const char *changedir; +- size_t instdirlen = strlen(instdir); +- +- if (instdirlen > 0 && fc_script_chrootless) +- changedir = instdir; +- else +- changedir = "/"; +- +- if (instdirlen > 0 && !fc_script_chrootless) { +- if (strncmp(admindir, instdir, instdirlen) != 0) +- ohshit(_("admindir must be inside instdir for dpkg to work properly")); +- if (setenv("DPKG_ADMINDIR", admindir + instdirlen, 1) < 0) +- ohshite(_("unable to setenv for subprocesses")); +- if (setenv("DPKG_ROOT", "", 1) < 0) +- ohshite(_("unable to setenv for subprocesses")); +- +- if (chroot(instdir)) +- ohshite(_("failed to chroot to '%.250s'"), instdir); ++ if (*instdir) { ++ setenv("D", instdir, 1); + } +- /* Switch to a known good directory to give the maintainer script +- * a saner environment, also needed after the chroot(). */ +- if (chdir(changedir)) +- ohshite(_("failed to chdir to '%.255s'"), changedir); +- if (debug_has_flag(dbg_scripts)) { +- struct varbuf args = VARBUF_INIT; +- const char **argv = cmd->argv; +- +- while (*++argv) { +- varbuf_add_char(&args, ' '); +- varbuf_add_str(&args, *argv); +- } +- varbuf_end_str(&args); +- debug(dbg_scripts, "fork/exec %s (%s )", cmd->filename, +- args.buf); +- varbuf_destroy(&args); +- } +- if (instdirlen == 0 || fc_script_chrootless) +- return cmd->filename; +- +- assert(strlen(cmd->filename) >= instdirlen); +- return cmd->filename + instdirlen; ++ return cmd->filename; + } + + /** +-- +2.1.4 + diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch new file mode 100644 index 0000000000..56c85c7733 --- /dev/null +++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch @@ -0,0 +1,31 @@ +From adb6bfd0feeceaf030df0debe3343d7f73e708a0 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 26 Aug 2015 16:27:45 +0300 +Subject: [PATCH 4/5] The lutimes function doesn't work properly for all + systems. + +Signed-off-by: Constantin Musca + +Upstream-Status: Inappropriate [embedded specific] +--- + src/archives.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/archives.c b/src/archives.c +index bff5f14..b711013 100644 +--- a/src/archives.c ++++ b/src/archives.c +@@ -449,8 +449,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path) + + if (te->type == TAR_FILETYPE_SYMLINK) { + #ifdef HAVE_LUTIMES +- if (lutimes(path, tv) && errno != ENOSYS) ++/* if (lutimes(path, tv) && errno != ENOSYS) + ohshite(_("error setting timestamps of '%.255s'"), path); ++*/ + #endif + } else { + if (utimes(path, tv)) +-- +2.1.4 + diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0005-dpkg-compiler.m4-remove-Wvla.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0005-dpkg-compiler.m4-remove-Wvla.patch new file mode 100644 index 0000000000..96e96f277b --- /dev/null +++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0005-dpkg-compiler.m4-remove-Wvla.patch @@ -0,0 +1,36 @@ +From 0ad7bba80d5b9035089ff2b2f77a774b5b201915 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 26 Aug 2015 16:28:59 +0300 +Subject: [PATCH 5/5] dpkg-compiler.m4: remove -Wvla +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Remove the -Wvla flag from the set of compiler warning flags, since gcc +on old host systems such as CentOS 5.8 doesn't support it, and it +causes a build error for dpkg-native. + +Upstream-Status: Pending + +Signed-off-by: Donn Seeley +Signed-off-by: Robert Yang +Signed-off-by: Aníbal Limón +--- + m4/dpkg-compiler.m4 | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/m4/dpkg-compiler.m4 b/m4/dpkg-compiler.m4 +index 682857c..23ed7d0 100644 +--- a/m4/dpkg-compiler.m4 ++++ b/m4/dpkg-compiler.m4 +@@ -52,7 +52,6 @@ AC_DEFUN([DPKG_CHECK_COMPILER_WARNINGS], [ + DPKG_CHECK_COMPILER_FLAG([-Wlogical-op]) + DPKG_CHECK_COMPILER_FLAG([-Wlogical-not-parentheses]) + DPKG_CHECK_COMPILER_FLAG([-Wswitch-bool]) +- DPKG_CHECK_COMPILER_FLAG([-Wvla]) + DPKG_CHECK_COMPILER_FLAG([-Winit-self]) + DPKG_CHECK_COMPILER_FLAG([-Wwrite-strings]) + DPKG_CHECK_COMPILER_FLAG([-Wcast-align]) +-- +2.1.4 + diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0006-add-musleabi-to-known-target-tripets.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0006-add-musleabi-to-known-target-tripets.patch new file mode 100644 index 0000000000..8797ea55c6 --- /dev/null +++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0006-add-musleabi-to-known-target-tripets.patch @@ -0,0 +1,42 @@ +From f8910022dc3ec622272f168cd0022dbdf6dff93a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 30 Dec 2015 23:05:41 +0000 +Subject: [PATCH] add musleabi to known target tripets + +helps compiling dpkg for musl/arm-softfloat + +Upstream-Status: Pending +Signed-off-by: Khem Raj +Signed-off-by: Aníbal Limón +--- + data/ostable | 1 + + data/tupletable | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/data/ostable b/data/ostable +index 99c1f889d..be6434271 100644 +--- a/data/ostable ++++ b/data/ostable +@@ -17,6 +17,7 @@ + eabi-uclibc-linux linux-uclibceabi linux[^-]*-uclibceabi + base-uclibc-linux linux-uclibc linux[^-]*-uclibc + eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf ++eabi-musl-linux linux-musleabi linux[^-]*-musleabi + base-musl-linux linux-musl linux[^-]*-musl + eabihf-gnu-linux linux-gnueabihf linux[^-]*-gnueabihf + eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi +diff --git a/data/tupletable b/data/tupletable +index 5f500f6ca..28f00bfe6 100644 +--- a/data/tupletable ++++ b/data/tupletable +@@ -8,6 +8,7 @@ + eabi-uclibc-linux-arm uclibc-linux-armel + base-uclibc-linux- uclibc-linux- + eabihf-musl-linux-arm musl-linux-armhf ++eabi-musl-linux-arm musl-linux-armel + base-musl-linux- musl-linux- + ilp32-gnu-linux-arm64 arm64ilp32 + eabihf-gnu-linux-arm armhf +-- +2.11.0 + diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch new file mode 100644 index 0000000000..1b985df0f5 --- /dev/null +++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch @@ -0,0 +1,39 @@ +From 8659eeeeda74d71e12080121f0b13a88cbdda433 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= +Date: Tue, 21 Feb 2017 11:23:27 -0600 +Subject: [PATCH] dpkg-deb/build.c: Remove usage of --clamp-mtime in tar +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Recently dpkg added --clamp-mtime to tar to create reproducible +build tarballs [1]. + +But host tools doesn't support this option because is new on tar +so disable in our builds. + +Signed-off-by: Aníbal Limón + +Upstream-Status: Inappropriate [Configuration] + +[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759999#20 +[2] https://lists.gnu.org/archive/html/help-tar/2016-01/msg00000.html +--- + dpkg-deb/build.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c +index a92b58e..a3d1912 100644 +--- a/dpkg-deb/build.c ++++ b/dpkg-deb/build.c +@@ -450,7 +450,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, + + command_init(&cmd, TAR, "tar -cf"); + command_add_args(&cmd, "tar", "-cf", "-", "--format=gnu", +- "--mtime", mtime, "--clamp-mtime", NULL); ++ "--mtime", mtime, NULL); + /* Mode might become a positional argument, pass it before -T. */ + if (mode) + command_add_args(&cmd, "--mode", mode, NULL); +-- +2.11.0 diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/add_armeb_triplet_entry.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/add_armeb_triplet_entry.patch new file mode 100644 index 0000000000..d165616a19 --- /dev/null +++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/add_armeb_triplet_entry.patch @@ -0,0 +1,48 @@ +Author: Krishnanjanappa, Jagadeesh +Date: Wed Apr 8 18:08:14 2015 +0530 + +[PATCH] add armeb triplet entry into triplettable. + +Cross-compling dpkg application for armeb fails with below error +during configure task, + +(snip) + configure:23141: checking dpkg cpu type + configure:23148: result: armeb + configure:23150: WARNING: armeb not found in cputable + configure:23162: checking dpkg operating system type + configure:23169: result: linux-gnueabi + configure:23171: WARNING: linux-gnueabi not found in ostable + configure:23183: checking dpkg architecture name + configure:23189: error: cannot determine host dpkg architecture +-- CUT -- + +the required combination of "gnueabi-linux-armeb" was not found in +the triplettable file thereby returning dpkg_arch as +empty in configure script. + +Upstream-Status: Pending + +Signed-off-by: Krishnanjanappa, Jagadeesh +Signed-off-by: Aníbal Limón + +--- + data/tupletable | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/tupletable b/data/tupletable +index b7802bec3..5f500f6ca 100644 +--- a/data/tupletable ++++ b/data/tupletable +@@ -12,6 +12,7 @@ base-musl-linux- musl-linux- + ilp32-gnu-linux-arm64 arm64ilp32 + eabihf-gnu-linux-arm armhf + eabi-gnu-linux-arm armel ++eabi-gnu-linux-armeb armeb + abin32-gnu-linux-mips64r6el mipsn32r6el + abin32-gnu-linux-mips64r6 mipsn32r6 + abin32-gnu-linux-mips64el mipsn32el +-- +2.11.0 + + diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/arch_pm.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/arch_pm.patch new file mode 100644 index 0000000000..4e0d22acbb --- /dev/null +++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/arch_pm.patch @@ -0,0 +1,29 @@ +configure cannot determine the proper cpu, os, or +architecture for mips64, and possibly other arch's +because of faulty code added to Arch.pm in the latest +release from upstream. We remove that code. + +Upstream-Status: Pending + +Signed-off-by: Joe Slater + +--- + scripts/Dpkg/Arch.pm | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm +index 1720847b8..6345ce3b9 100644 +--- a/scripts/Dpkg/Arch.pm ++++ b/scripts/Dpkg/Arch.pm +@@ -323,9 +323,6 @@ sub _load_tupletable() + (my $dt = $debtuple) =~ s//$_cpu/; + (my $da = $debarch) =~ s//$_cpu/; + +- next if exists $debarch_to_debtuple{$da} +- or exists $debtuple_to_debarch{$dt}; +- + $debarch_to_debtuple{$da} = $dt; + $debtuple_to_debarch{$dt} = $da; + } +-- +2.11.0 diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/noman.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/noman.patch new file mode 100644 index 0000000000..a7f3cb8f45 --- /dev/null +++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/noman.patch @@ -0,0 +1,22 @@ +Upstream-Status: Inappropriate [disable feature] + +--- + Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 0da52cb16..a1f79e0a2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -13,8 +13,7 @@ SUBDIRS = \ + $(MAYBE_DSELECT) \ + scripts \ + t-func \ +- po \ +- man ++ po + + ACLOCAL_AMFLAGS = -I m4 + +-- +2.11.0 diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/remove-tar-no-timestamp.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/remove-tar-no-timestamp.patch new file mode 100644 index 0000000000..4f408ff777 --- /dev/null +++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/remove-tar-no-timestamp.patch @@ -0,0 +1,17 @@ +busybox-1.19.4 tar utility doesn't support --warning=no-timestamp + +Signed-off-by: Constantin Musca + +Upstream-Status: Inappropriate [configuration] +Index: dpkg-1.17.1/dpkg-deb/extract.c +=================================================================== +--- dpkg-1.17.1.orig/dpkg-deb/extract.c ++++ dpkg-1.17.1/dpkg-deb/extract.c +@@ -318,7 +318,6 @@ extracthalf(const char *debar, const cha + + command_add_arg(&cmd, "-f"); + command_add_arg(&cmd, "-"); +- command_add_arg(&cmd, "--warning=no-timestamp"); + + m_dup2(p2[0],0); + close(p2[0]); diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb deleted file mode 100644 index b9b22a316e..0000000000 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Debian's start-stop-daemon utility extracted from the dpkg \ -package" -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://utils/start-stop-daemon.c;endline=21;md5=8fbd0497a7d0b01e99820bffcb58e9ad" -# start-stop-daemon is usually shipped by dpkg -DEPENDS = "ncurses" -RCONFLICTS_${PN} = "dpkg" - -SRC_URI = " \ - ${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.xz \ - file://0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch \ - file://0001-Add-linux-musleabi-to-ostable.patch \ -" - -SRC_URI[md5sum] = "e48fcfdb2162e77d72c2a83432d537ca" -SRC_URI[sha256sum] = "07019d38ae98fb107c79dbb3690cfadff877f153b8c4970e3a30d2e59aa66baa" - -inherit autotools gettext pkgconfig - -S = "${WORKDIR}/dpkg-${PV}" - -EXTRA_OECONF = " \ - --without-bz2 \ - --without-selinux \ -" - -do_install_append () { - # remove everything that is not related to start-stop-daemon, since there - # is no explicit rule for only installing ssd - find ${D} -type f -not -name "*start-stop-daemon*" -exec rm {} \; - find ${D} -depth -type d -empty -exec rmdir {} \; - - # support for buggy init.d scripts that refer to an alternative - # explicit path to start-stop-daemon - if [ "${base_sbindir}" != "${sbindir}" ]; then - mkdir -p ${D}${base_sbindir} - ln -sf ${sbindir}/start-stop-daemon ${D}${base_sbindir}/start-stop-daemon - fi -} diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.18.25.bb b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.18.25.bb new file mode 100644 index 0000000000..b372d3c4a1 --- /dev/null +++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.18.25.bb @@ -0,0 +1,87 @@ +SUMMARY = "Debian's start-stop-daemon utility extracted from the dpkg \ +package" +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://utils/start-stop-daemon.c;endline=21;md5=8fbd0497a7d0b01e99820bffcb58e9ad" +DEPENDS = "zlib bzip2 perl ncurses" +# start-stop-daemon is usually shipped by dpkg +RCONFLICTS_${PN} = "dpkg" + +SRC_URI = " \ + ${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.xz \ + file://0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch \ + file://noman.patch \ + file://remove-tar-no-timestamp.patch \ + file://arch_pm.patch \ + file://add_armeb_triplet_entry.patch \ + file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \ + file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \ + file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \ + file://0005-dpkg-compiler.m4-remove-Wvla.patch \ + file://0006-add-musleabi-to-known-target-tripets.patch \ + file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ + file://0001-dpkg-Support-muslx32-build.patch \ +" +SRC_URI[md5sum] = "e463f58b04acb23659df23d2a7a05cff" +SRC_URI[sha256sum] = "c49c371953aea03f543814dcae37c069e86069333fb2e24e9252e76647663492" + +inherit autotools gettext perlnative pkgconfig perl-version + +S = "${WORKDIR}/dpkg-${PV}" + +EXTRA_OECONF = "\ + --disable-dselect \ + --enable-start-stop-daemon \ + --with-libz \ + --with-libbz2 \ + --without-libselinux \ + " + +PACKAGECONFIG = "liblzma" +PACKAGECONFIG[liblzma] = "--with-liblzma,--without-liblzma, xz" + +export PERL = "${bindir}/perl" +export PERL_LIBDIR = "${libdir}/perl/${@get_perl_version(d)}" +EXTRA_OECONF += "TAR=tar" + +EXTRA_OECONF_append_class-target = " DEB_HOST_ARCH=${DPKG_ARCH}" + +DPKG_ARCH ??= "${@deb_arch_map(d.getVar('TARGET_ARCH'), d.getVar('TUNE_FEATURES'))}" + +def deb_arch_map(arch, tune): + tune_features = tune.split() + if arch == "allarch": + return "all" + if arch in ["i586", "i686"]: + return "i386" + if arch == "x86_64": + if "mx32" in tune_features: + return "x32" + return "amd64" + if arch.startswith("mips"): + endian = ["el", ""]["bigendian" in tune_features] + if "n64" in tune_features: + return "mips64" + endian + if "n32" in tune_features: + return "mipsn32" + endian + return "mips" + endian + if arch == "powerpc": + return arch + ["", "spe"]["spe" in tune_features] + if arch == "aarch64": + return "arm64" + if arch == "arm": + return arch + ["el", "hf"]["callconvention-hard" in tune_features] + return arch + +do_install_append () { + # remove everything that is not related to start-stop-daemon, since there + # is no explicit rule for only installing ssd + find ${D} -type f -not -name "*start-stop-daemon*" -exec rm {} \; + find ${D} -depth -type d -empty -exec rmdir {} \; + + # support for buggy init.d scripts that refer to an alternative + # explicit path to start-stop-daemon + if [ "${base_sbindir}" != "${sbindir}" ]; then + mkdir -p ${D}${base_sbindir} + ln -sf ${sbindir}/start-stop-daemon ${D}${base_sbindir}/start-stop-daemon + fi +} From patchwork Thu Jan 3 18:07:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 154730 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp931314ljp; Thu, 3 Jan 2019 10:08:06 -0800 (PST) X-Google-Smtp-Source: ALg8bN7ByhWS+EDpWMdSmO8Exz1e2U2IVJvajOU9OiR3Qv88BwfaA5J9mjFjnySwiVYNbDLY4tav X-Received: by 2002:a63:9712:: with SMTP id n18mr17623983pge.295.1546538886726; Thu, 03 Jan 2019 10:08:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546538886; cv=none; d=google.com; s=arc-20160816; b=U84mPhBJj8Bf8GZTXGjunasTOIwsFspvgPmYY7xa72bWoyaF7Dg4/T1k4kSOmCJ7hl EHtutpM5zLPBJGNl479/6gWUyoiH31DcZXFBq1DqxXjcv6oGRh9NuV2u0bSKuuGbhpSc 2Am5ax80RwsRCURGWy+2pZeHfrRh+bpYkhzRW+8PwiWXQGN8eJPqouTxa3A0r/RcmdjZ yh0JjZsjKacLY5Q9AdmngXipozQXjq1aHLgfRE3k5X9sqwUUQwnxYgytWklXbB1xjo3E yd44zPy+YF9jqvAs8c4kjjGFxzqa0j9v4m0onfE0oDVbjxYunPzx8u2aeNeg7jKkEa+n okOQ== 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; bh=/jMOfy32jMjaaVS4CgHOUm9JRWFLwRJxaXgoXBCNbDk=; b=Rf6T7IMvv0ow9UTcDSgWaypGxO0P8Uwuku9YY4IfXrfSIsqLExleT+XPTjWGc5ibpb QY7bDIzJWTucr+IsyvxfAyjYmACx1mtgzzXsT5XSybJW1/Qi9/7VZQQCYtsWLBipw41c UOVIvfjurEMhsP0QFCtj4jJK/ByE9fdcYU8IDzGoxTi6jn8T8vKev0vjFFq2cU07U7JT QYB88gOgnzStwnFxH+1QdeI54R1iVKTZCRJXmkpwyCH3cbPTan55+lGPrhxZhtF4ZVPJ dat8dAn6e4K1ueWoC0upvOCxq51P5RD4/sDJSUjnSpUaqwpRtMBwMlym2SqJH7md7xXM Eyxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=O5DsUE65; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 k69si53216086pga.176.2019.01.03.10.08.06; Thu, 03 Jan 2019 10:08:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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=O5DsUE65; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0C63679C7C; Thu, 3 Jan 2019 18:08:01 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@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 54EEC79BA6 for ; Thu, 3 Jan 2019 18:07:59 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id i12so17025258pfo.7 for ; Thu, 03 Jan 2019 10:08:00 -0800 (PST) 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=0oJNa15qPxuOkHIBlRgXMBqEq6MOeSQMjLMVlj3GR3E=; b=O5DsUE65RLqe2x8ImrgXRkXYpkteVLGheSppgQ5BtSycjzSInYhrsXQvZ4a5yG7tQG lu0H2o/Z4lqFoTOxzItgGDVj2Z7VyR3XBiM/xRt+7zkqwBBzVdbexfbA4wIL7OVdusJC ZSftJUVomXTBEP45TIbAORwpRHNPpU6udXjm/G7VcqQxfJspWUOkm//fuzchuegK7bUg skyVqV8u6qylBkRBGXLdUGMvU9vOL7bOUcJoets6+Jmcua669/Pg0IWrDB1vQErIPwgJ 7Vvnu6jSOQ10i3YNMgkFBTvj9Ya4SIkNrMR6B9vxRqAdKpaEONpH7Ds0PQhhoJ+dtArP 7fXw== 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=0oJNa15qPxuOkHIBlRgXMBqEq6MOeSQMjLMVlj3GR3E=; b=RzkpGv6w3U9/3YaQas+J34XHIhe1Mp0zQnCPfliDtj+x8J+omas7T8wUT4is+yaAjU 8Gy/iOZ/f+o+wbQAdjlKb+Ljjv8XDsUk2C1NdsTBU3ONKbcAnjH/RDbCPeMyEeaHR7pi 9A8K3P8izOh3mqrqzFpw5a7+BmOsy+vW97boFc3AFRhEt6lwI3YBofaYJtgEVqXVTxHL UniAc2rEzNclm0wpelFTJ19u1SZmL6gGIpLpN2D9SVFbk2OeOrZ8Kgf4CJd9TqWpDnsX gUsf2ansS7ONVeYxun4Va2os+1buA6l3K5i9oF/aLUMHWln8nHU5VGp492cVAwtwFpdA T1eQ== X-Gm-Message-State: AJcUukeEheN2J8WfyLng5s4SkwhLv87N++DPnRQgLakoM4WeUJUa/s7A KXHiCoLP0I9fN97A3nVfJgTOvTN16/A= X-Received: by 2002:a63:b105:: with SMTP id r5mr17998205pgf.442.1546538879966; Thu, 03 Jan 2019 10:07:59 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:877f:9499::6ee7]) by smtp.gmail.com with ESMTPSA id m67sm75487168pfm.73.2019.01.03.10.07.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Jan 2019 10:07:59 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 3 Jan 2019 10:07:50 -0800 Message-Id: <20190103180751.24958-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190103180751.24958-1-raj.khem@gmail.com> References: <20190103180751.24958-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 2/3] mpv: Disable lua on mips/aarch64 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Luajit depeendency is not available on mips64/aarch64 Signed-off-by: Khem Raj --- meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb index c2e8e3d574..6586e352ea 100644 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb @@ -25,9 +25,12 @@ SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f2 inherit waf pkgconfig pythonnative distro_features_check +LUA ?= "lua" +LUA_mips64 = "" +LUA_aarch64 = "" # Note: both lua and libass are required to get on-screen-display (controls) PACKAGECONFIG ??= " \ - lua \ + ${LUA} \ libass \ ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ " From patchwork Thu Jan 3 18:07:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 154732 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp931773ljp; Thu, 3 Jan 2019 10:08:35 -0800 (PST) X-Google-Smtp-Source: ALg8bN7eQS4MQh2bD77xgpQ9Fqpw3v3Tpqnl16XcmhqXdeyY0Z5a7rYjZyYIvx8k1Vlj9S1Tt8sK X-Received: by 2002:a63:4e15:: with SMTP id c21mr17961328pgb.50.1546538915822; Thu, 03 Jan 2019 10:08:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546538915; cv=none; d=google.com; s=arc-20160816; b=ueCRnxT8+oKz0XAWZKG/gO1vTdkooR9TcoOT2KbavOufcclwYP0tGj7uv9961AbGwB ILG/d5FzZNH9tBZQSxNT5u8HjuionRlpFb9MfFBYOLPvP2/ZP5F1RVKWYSs9j/dYep6q zqKk8Kk2CbNGN7WdBpDjJ52eVzFQ7loukG2pK/x5Ut+LYVmd7ci799kpQzXOGH3MDbP9 aVZKcziVuwyVpWqr/+IaRxVUAdPyqkSIxNQB5m4UWGYiDqrfo8lvW3FPfxsnYK4XcSJi irL3CDR3e1XtPz2T02dGA3VUD5wAgLv0dqyv5+O7FYhLq4ZmtdzfTGMurIpwlp1u1McC IseA== 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; bh=ed2gyiJITEoXD5zl9Wq8HS/Fqfy655S8d+kWUf35H2o=; b=0M+EOvxNedSnNNGkD/ysxtuLSqGlSPN7/eRmILgyNF+Fvbc4hq/+pWxMjunSWXBGBy HLknUxyI/XqtF4c8CATCNi5Mk9y/3XcLnHP8/WmMoMQTZ9ENuM8q7sKXI5uu7svb8J1u rMaw+zXH2y3XZv7ki53a7HZBYTC/+Zh3q8RK2tcaYJMjf1vHMJeBjnwCtUoqx/samaxv m0mx/ccK7IGtvd8/b1C2U4WZuWEES1g/u43uAA3Qs/WS9weFUnueF7pAU7pEaUHPjK8y C7nS979mEQG6q1vnptRnGK982wwgz+QXbG/AyGbReuZXlXJfs0+7why0bT5bibtsYIQs Hvyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=JWdYuLuB; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 r81si1862670pfr.164.2019.01.03.10.08.35; Thu, 03 Jan 2019 10:08:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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=JWdYuLuB; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3548879C9B; Thu, 3 Jan 2019 18:08:28 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mail.openembedded.org (Postfix) with ESMTP id 6E96A74813 for ; Thu, 3 Jan 2019 18:08:01 +0000 (UTC) Received: by mail-pg1-f179.google.com with SMTP id y4so16300757pgc.12 for ; Thu, 03 Jan 2019 10:08:02 -0800 (PST) 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=cKiuPVTbPoaJtrFSx+aUSdpI+UzMXyqTaFQ9NzMzLUI=; b=JWdYuLuBPsM5kpnfhJ7dTnBG9x5ALGD1Mqm5OGC8K/mDkMCm30Y7Ji26ve5K/GZjrl 50FXUdbB4hoCAoUJ4GxIpeXM9S6yBcHXGvGtKrp6PK8mZpU/2NF9PpMU0KGvk87hZwgK OZoWEwxn/5Nvg6GMCfQkAazXpM1YaqGM5k1OL3dQaH12Jm82UtANJyHotfVEpx5m6pL2 uZvJzTgKG+iB/4GufB1rB2e9tiwaSz0bHDbdb5Mi+7C4TbPGVH+8mimRd1DPPwKuHMdP Yojc+So0r829YxSbsbVg3g9L/xvURVwTu4MHUmQpb4blj5DRt4cQ8wXkjs2S6oR8o+mN LdJg== 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=cKiuPVTbPoaJtrFSx+aUSdpI+UzMXyqTaFQ9NzMzLUI=; b=Uy7TgMuNggAm7U73HWYfrNnJnslaUoYztp0bsECkqjuq+B/UscwCcsMiO3cWXR3zPx EcwtbXWCl4LuhcY9njX6S+ZsNDtM1n8EZwQImc3XEAClBWyjGEq7uAUv2bF7u0nfG9QD 6F74najrCYz7MF/0rjy0NN9phXGNMABfeWQSXI0eX5NIm+dK/pfQGJb8uxm3EvJdJoE4 qbuawSOD+wzNMdFLelmOLPBJ2JilfxqyqK2vRgE/j6BcN3gDrqRB3yTwSsE2X85UbQcv ZtET02QmU5eDQR21zEaPZGwfqQOO5PzijpL0QocCpFEFvSConN2cNsUCHlPexi1qTb4i o7xA== X-Gm-Message-State: AJcUukfeiQ2TGObRzwUHGr+JK5E/KyUe8GOuGztWvumPtOc2K9u4HeuP J92+6/xbEpozLY3r67bg/thlBdERPkw= X-Received: by 2002:a63:ac46:: with SMTP id z6mr17903117pgn.162.1546538881693; Thu, 03 Jan 2019 10:08:01 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:877f:9499::6ee7]) by smtp.gmail.com with ESMTPSA id m67sm75487168pfm.73.2019.01.03.10.07.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Jan 2019 10:08:00 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 3 Jan 2019 10:07:51 -0800 Message-Id: <20190103180751.24958-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190103180751.24958-1-raj.khem@gmail.com> References: <20190103180751.24958-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 3/3] sysdig: Upgrade to 0.24.1 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org * License changed to Apache-2.0 upstream as well [1] * Forward port patches to apply on 0.24 * Just build libb64 from internal modules everything else should be provided by OE recipes * Disable luajit on aarch64 and mips64 since luajit on these arches is not available, fall back to liblua Signed-off-by: Khem Raj --- ...usl-backtrace-APIs-are-glibc-specifi.patch | 37 +++++++++---------- ...-libsinsp-Port-to-build-with-lua-5.2.patch | 25 +++++-------- meta-oe/recipes-extended/sysdig/sysdig_git.bb | 34 ++++++++--------- 3 files changed, 45 insertions(+), 51 deletions(-) -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch index 7d3f8a19d7..6ba436911a 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch +++ b/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch @@ -9,42 +9,41 @@ Signed-off-by: Khem Raj userspace/libsinsp/utils.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) -diff --git a/userspace/libsinsp/utils.cpp b/userspace/libsinsp/utils.cpp -index 8f23f9c..c496a57 100644 --- a/userspace/libsinsp/utils.cpp +++ b/userspace/libsinsp/utils.cpp -@@ -21,7 +21,9 @@ along with sysdig. If not, see . +@@ -22,7 +22,7 @@ limitations under the License. #include #include #include -+#ifdef __GLIBC__ +-#ifndef CYGWING_AGENT ++#if !defined(CYGWING_AGENT) || defined(__GLIBC__) #include -+#endif + #endif #include - #include - #include -@@ -741,7 +743,7 @@ uint64_t sinsp_utils::get_current_time_ns() - return tv.tv_sec * (uint64_t) 1000000000 + tv.tv_usec * 1000; - } +@@ -772,6 +772,7 @@ bool sinsp_utils::glob_match(const char --#ifndef _WIN32 -+#if defined(_WIN32) && defined(__GLIBC__) + #ifndef CYGWING_AGENT + #ifndef _WIN32 ++#ifdef __GLIBC__ void sinsp_utils::bt(void) { static const char start[] = "BACKTRACE ------------"; -diff --git a/userspace/libsinsp/utils.h b/userspace/libsinsp/utils.h -index 600d00b..4ab4650 100644 +@@ -793,6 +794,7 @@ void sinsp_utils::bt(void) + + free(bt_syms); + } ++#endif // Glibc + #endif // _WIN32 + #endif // CYGWING_AGENT + --- a/userspace/libsinsp/utils.h +++ b/userspace/libsinsp/utils.h -@@ -79,7 +79,7 @@ public: +@@ -104,7 +104,7 @@ public: - static uint64_t get_current_time_ns(); + static bool glob_match(const char *pattern, const char *string); -#ifndef _WIN32 +#if not defined(_WIN32) && defined(__GLIBC__) // // Print the call stack // --- -2.6.2 - diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch index 8fec0ca59f..1c71b91fcc 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch +++ b/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch @@ -8,38 +8,36 @@ Signed-off-by: Khem Raj userspace/libsinsp/chisel.cpp | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) -diff --git a/userspace/libsinsp/chisel.cpp b/userspace/libsinsp/chisel.cpp -index 3cfbd8d..2db9348 100644 --- a/userspace/libsinsp/chisel.cpp +++ b/userspace/libsinsp/chisel.cpp -@@ -94,7 +94,7 @@ void lua_stackdump(lua_State *L) +@@ -97,7 +97,7 @@ void lua_stackdump(lua_State *L) // Lua callbacks /////////////////////////////////////////////////////////////////////////////// #ifdef HAS_LUA_CHISELS --const static struct luaL_reg ll_sysdig [] = +-const static struct luaL_reg ll_sysdig [] = +const static struct luaL_Reg ll_sysdig [] = { {"set_filter", &lua_cbacks::set_global_filter}, {"set_snaplen", &lua_cbacks::set_snaplen}, -@@ -120,7 +120,7 @@ const static struct luaL_reg ll_sysdig [] = +@@ -133,7 +133,7 @@ const static struct luaL_reg ll_sysdig [ {NULL,NULL} }; --const static struct luaL_reg ll_chisel [] = +-const static struct luaL_reg ll_chisel [] = +const static struct luaL_Reg ll_chisel [] = { {"request_field", &lua_cbacks::request_field}, {"set_filter", &lua_cbacks::set_filter}, -@@ -131,7 +131,7 @@ const static struct luaL_reg ll_chisel [] = +@@ -145,7 +145,7 @@ const static struct luaL_reg ll_chisel [ {NULL,NULL} }; --const static struct luaL_reg ll_evt [] = +-const static struct luaL_reg ll_evt [] = +const static struct luaL_Reg ll_evt [] = { {"field", &lua_cbacks::field}, {"get_num", &lua_cbacks::get_num}, -@@ -853,10 +853,28 @@ bool sinsp_chisel::parse_view_info(lua_State *ls, OUT chisel_desc* cd) +@@ -959,10 +959,28 @@ bool sinsp_chisel::parse_view_info(lua_S #ifdef HAS_LUA_CHISELS @@ -69,7 +67,7 @@ index 3cfbd8d..2db9348 100644 if(ls == NULL) { return false; -@@ -867,9 +885,9 @@ bool sinsp_chisel::init_lua_chisel(chisel_desc &cd, string const &fpath) +@@ -973,9 +991,9 @@ bool sinsp_chisel::init_lua_chisel(chise // // Load our own lua libs // @@ -82,13 +80,13 @@ index 3cfbd8d..2db9348 100644 // // Add our chisel paths to package.path -@@ -1111,16 +1129,16 @@ void sinsp_chisel::load(string cmdstr) +@@ -1203,16 +1221,16 @@ void sinsp_chisel::load(string cmdstr) // // Open the script // - m_ls = lua_open(); + m_ls = luaL_newstate(); - + luaL_openlibs(m_ls); // @@ -103,6 +101,3 @@ index 3cfbd8d..2db9348 100644 // // Add our chisel paths to package.path --- -2.6.2 - diff --git a/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/meta-oe/recipes-extended/sysdig/sysdig_git.bb index 4f58281f9f..bbe25e8d43 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig_git.bb +++ b/meta-oe/recipes-extended/sysdig/sysdig_git.bb @@ -3,39 +3,39 @@ DESCRIPTION = "Sysdig is open source, system-level exploration: capture \ system state and activity from a running Linux instance, then save, \ filter and analyze." HOMEPAGE = "http://www.sysdig.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=f8fee3d59797546cffab04f3b88b2d44" inherit cmake pkgconfig OECMAKE_GENERATOR = "Unix Makefiles" -DEPENDS = "luajit zlib ncurses" +DEPENDS = "luajit zlib ncurses jsoncpp tbb jq openssl elfutils" +DEPENDS_remove_mips64 = "luajit" +DEPENDS_remove_aarch64 = "luajit" +DEPENDS_append_aarch64 = " lua" +DEPENDS_append_mips64 = " lua" RDEPENDS_${PN} = "bash" -SRC_URI = "git://github.com/draios/sysdig.git;branch=master \ +SRC_URI = "git://github.com/draios/sysdig.git;branch=dev \ file://0001-libsinsp-Port-to-build-with-lua-5.2.patch \ file://0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch \ " -SRCREV = "85d16f33a82a17f87ccdbc088749271c71d87013" -PV = "0.1.102+git${SRCPV}" +# v0.24.2 +SRCREV = "aa82b2fb329ea97a8ade31590954ddaa675e1728" +PV = "0.24.2+git${SRCPV}" S = "${WORKDIR}/git" -DIR_ETC="/etc" -EXTRA_OECMAKE = ' -DUSE_BUNDLED_LUAJIT="OFF" \ - -DUSE_BUNDLED_ZLIB="OFF" \ - -DBUILD_DRIVER="OFF" \ - -DUSE_BUNDLED_NCURSES="OFF" \ - -DDIR_ETC="${DIR_ETC}" \ - ' +EXTRA_OECMAKE = "\ + -DUSE_BUNDLED_DEPS=OFF \ + -DBUILD_DRIVER=OFF \ + -DUSE_BUNDLED_B64=ON \ + -DDIR_ETC=${sysconfdir} \ +" FILES_${PN} += " \ ${DIR_ETC}/* \ ${datadir}/zsh/* \ ${prefix}/src/* \ " - -# luajit not supported on Aarch64 -COMPATIBLE_HOST = "^(?!aarch64).*" -