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"