From patchwork Wed Aug 8 17:04:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143633 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1062771ljj; Wed, 8 Aug 2018 10:05:24 -0700 (PDT) X-Google-Smtp-Source: AA+uWPzvuasjtX4Wj+pdlvRFceESv4YhFk4zIqzE8Y82pNiRj4g9X6SuB79+yoNH93A5fMR4DxDR X-Received: by 2002:a17:902:7586:: with SMTP id j6-v6mr3335257pll.295.1533747924397; Wed, 08 Aug 2018 10:05:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533747924; cv=none; d=google.com; s=arc-20160816; b=tJudgHQxM6k70g+OB+7rhF0R0q2dKt5Tb2P4OdK9OmSLuDqCcdB/DenaEQJhThjhtZ mCBu18ErfelcXBbg2y1OC1MY8zG+c+1a7HY7VVqQKAqEKoUmQ+X6nUph+YMZhrJkDKX1 +6tjTmRvJ6liTvly8WRaGVSafPQzRasku6f5U1Wgh4lGzl9gUUGDjqYONHDKiI7SdKe+ dfwC8nsjymVj+2tIY6JdZhrxtNCeBWkIkIis6reJ9KItUarKQI7TObEwNNPJQ9zQAXBS sF+FcJxoXHL/apTOAPDQT3W2Fv7Xfcb1MJZN/AtxZ9eG6Abzn3xQz7DiA+JSYqJKkIXZ LojA== 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=LpS3ifCER2rFkoF/Zw1ezHZ9lSTZ0p62tj8XfsyDmxC+Kz99ihF7txZyE1j8sv1/Ey oK2gDp1rEDdScLLIfN5Q0aF5M1h5pMTfUd/BG/BVaoLJM4MxARdZt8jHCqTqyhhSNYON vuwUnAaoRXPskzVfV6TFVEvgf9CguWRgJq6OMK8Q7OlEd154NavrQl0xNoz8i+7jvxY3 gkkMgWIEoFegA+tV/vzpAjb1jtu6dmxHXSwmyO/RlaHi6bhViVj/WU+/UB1IU/++/6ev a89RVrNM4ZoHhW2sWtWMicDGpxpxyb0e1hDU90ZwRmlA/y2LaJ81uVAJ2jkjmlPXsHww c0Rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=YxUD+SQu; 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 m12-v6si4065395pgd.334.2018.08.08.10.05.24; Wed, 08 Aug 2018 10:05: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=YxUD+SQu; 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 0593378E70; Wed, 8 Aug 2018 17:04:45 +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 4FD1A78E6B for ; Wed, 8 Aug 2018 17:04:42 +0000 (UTC) Received: by mail-pg1-f176.google.com with SMTP id r1-v6so1364559pgp.11 for ; Wed, 08 Aug 2018 10:04: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=E7VFSq1EoOQ2NT4EPGLbIbbo7tlrOOvFeHSTu0lO9jo=; b=YxUD+SQuTK9remQB/X7BBftfaagK1eii/+FGdQihbpIfPK34gBlsSMb+3oKkabN1HN bNEnGEwljg1mnWhSMbO6se8E6xUTyULuMnKtTr7/6Rj+/BkiNVSFcuNxKj++hLtQJrPX q9ei27QaQiDGYEQvOnSeQhN8kgSy1iZMs14CqyheT6MSIaOAFurSjmkdcqSOTpjZH4J1 12h/PpbBH9I5SSTuqMcRCjaDH3Ks1IARj403ewDCC7TlWPiUZ9uznepnd75QFMZoUV5U BDcVNsa8sIIb8yPzqYlHzHJH5giJKrtUO9ctx7IAvf8YiU542Wjf5yfZlmine1QId3DO BLFQ== 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=dyDh3dpxe3WsYtSaGMbUN8OPUweCGlVXPsuoDlu4DbJeZQhJRGBDhOkUuysczaweGa kjYAO55vaogLKJqJNPVigCIuZFFONZLo0Uc5DBSXpjzNVIm3NTP5NAHwQhGFpO0uG1ng UVoUqJ9EPHpTtxcRIhKcIdnDpPAqxC5Na0QDL/+zhWMYNqyj37vtaGSDvxc4lx553yNF IPZj+QyKvUF5jCHE6d4b6lXTFqy0r8ijm8xj3HnOs5VYnPkHlzxtP1pP/jrLpZQ0FkvP EfxaSDrSXO2am6JZUn7zqdCzfCL8GloDGYDkj+0w/gKbQPH1k7JHtFICkHCdN5jBkcVn fB0Q== X-Gm-Message-State: AOUpUlEmYoT6RgmK1nAy7RkQo2HX8IJ+qpKaJdS0kLHxENFvbTp7+N0H kKerzDVnONvxUxw3YLxz/ZSw8tEq X-Received: by 2002:a63:6c05:: with SMTP id h5-v6mr3372812pgc.367.1533747882994; Wed, 08 Aug 2018 10:04:42 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id h9-v6sm3673108pfe.187.2018.08.08.10.04.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Aug 2018 10:04:42 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 8 Aug 2018 10:04:25 -0700 Message-Id: <33de34276c7905018d6f4c09189bb27dec863882.1533747698.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [OE-core] [PATCH 8/8] 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"