From patchwork Mon Jul 22 07:26:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 169346 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp7170313ilk; Mon, 22 Jul 2019 00:27:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqz1WwrBVc0mQyN+e/z4q/ac64VLevSKsw5v6t9QRmMGnKyblLGccR9WErCEPjxzOfcH7STk X-Received: by 2002:a17:902:42a5:: with SMTP id h34mr76197467pld.16.1563780425911; Mon, 22 Jul 2019 00:27:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563780425; cv=none; d=google.com; s=arc-20160816; b=NgRXPi+fRfbJz/3F95QSx95o2J87E4jgV/siSfyqeO9TvwpAx+QBT0kNLKbypDDaAu SMIQ1ko8KMFq7vF8L5pZjOwAEau6sX3HrlMHhVSkKuL6oTtcraf0p0PkKr53RF+p7/zs H3+Eh5+4k0ee1R5VnEEN1QCNCBHY/BX8s3H/srJJ8Yt/CTTj0mo1kUkkssEQjU8vwn9A ipBfGTQdhWwy7h1zk33e9kgOp8hTIY3t5B0+gGvqtnyqt8OJmz8XKoXyaQOY+CB8O/JH veT0LLD0wN4ruE7c8XJsLSRa2Z6OA5ouXYmM8FUwAEbc578zOx8s9sf4z4eIjBgY3mvL //fg== 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 :user-agent:content-disposition:mime-version:message-id:to:from:date :dkim-signature:delivered-to; bh=qi++6F3+k2/iVB1nawimase64ePOaf38VqbDjEde37g=; b=zaI5aPWYO7kcsUx3yG2mc1DrLqQQVx89tKVAaKIGHhEaj4eh3q12SZZif4eI0LBYdo /Ib2ziUQk0wprc/QThij7v2qiCUOE7iy75N1dQrXj+GngO3OfwaMwXibSP8b433Wfm+O INQRVTFAqrqTAjyZ2jHFF55zV+cTGGQ98PoqSDzb56aQvg2DY0sz7381KZPg7Sn6oazP o+dQ8id+w75uWikt6JwBDjpl0OwE/40r6JOM4pUjB+IueX/KaCwNVWljr6AdJwq+KCn8 6wqLY4J/3sYSq0uuW0lNKzzpBO4CSSNoNqtxbVWtcS58po3tTRR+IQ/RC3AyoY6SgwwA MikQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PSwjGOPF; 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 131si8233186pfu.165.2019.07.22.00.27.05; Mon, 22 Jul 2019 00:27:05 -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=PSwjGOPF; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id CB1C77F022; Mon, 22 Jul 2019 07:27:03 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mail.openembedded.org (Postfix) with ESMTP id AB2717F022 for ; Mon, 22 Jul 2019 07:27:02 +0000 (UTC) Received: by mail-pf1-f177.google.com with SMTP id q10so16938652pff.9 for ; Mon, 22 Jul 2019 00:27:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=/KwXwlhsXlOle41zJH/kd12lDPOiy7K69IxQev6rvgA=; b=PSwjGOPF3ATkHywteEecv2gP6lkP2OCBJw2vHoQAncvZ4Bm+BcH48kYS7lHd+Rv4C7 hFlxUq1RvnxYtCnRmaIcYccKxzgxauGWlshc53VbR4Yovguxpt9CYfdIiFBIqBu1JorI LkLp+rHoJDHtYmmRpUk3CP+jG5m4Bi91b4EBXjm0jLH06SyaPDbbcwist2UAJRS2PQyc 8n+c61Pi1Cpv6S6G9XInC+9DOb/bAEOV+s1M+J7PJzyDJApouOMglvw2Ci/+tvj1+Vdk mnLEi2m/0Ug0GuhjrGVBrHudRb/9OQTQgiaZlzAqrxKnbtM6bgyMp4SMUJtaiZgRX1aH M9Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=/KwXwlhsXlOle41zJH/kd12lDPOiy7K69IxQev6rvgA=; b=Jgzemhvyw569QDpo4fGVB6dXH/hgTrdDbKhP/9OhTa0ZXdWi18wJ3nXQ9S0WxT0Nrl qjQsl8fXw3596rPdT/Ib3q+YPM6o4i+bfxKOWklym9mpQAMxR9nZyjWuoOTWrku3ecAZ GPsyf5jkN7ufevjQJa+xF/5CRv7y//FpszWx0UjH4Vp6Atw1AFJkiPQv/8DSItSMxLzJ tS6S4x22G/AdWlsUy4Syn3+24QhZ/jHtsKpefhgSmdKwyOGHrsxUW8ZkC1u/B0DSv6f4 SK4RIcn+mg0ZiKee+BjAOp9e0M3/Te+vxHKB5QNTke8O18Iy63oG4HfYQnedb68s8EGO S2VA== X-Gm-Message-State: APjAAAUlpZXbPVJ/8vMVAQw8WVLqO5MpuMyNcgavLs9LDY4NI2i0ORkE uG8jWCNstNgh7TlzRbEdkJa5wvtrcAo= X-Received: by 2002:a17:90a:cf8f:: with SMTP id i15mr24832694pju.110.1563780423355; Mon, 22 Jul 2019 00:27:03 -0700 (PDT) Received: from apollo (c-73-71-176-3.hsd1.ca.comcast.net. [73.71.176.3]) by smtp.gmail.com with ESMTPSA id e189sm9374887pgc.15.2019.07.22.00.27.02 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 22 Jul 2019 00:27:03 -0700 (PDT) Date: Mon, 22 Jul 2019 00:26:54 -0700 From: Khem Raj To: openembedded-core@lists.openembedded.org Message-ID: <20190722072654.eks3gy2e66wzhhun@apollo> MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20180716 Subject: [OE-core] [PATCH 3/3] sysvinit: Include sys/sysmacros.h for major/minor definitions on musl too 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 Fixes musl issue implicit declaration of function 'minor' is invalid in C99 [-Wimplicit-function-declaration] which eventually ends up with a linker error Signed-off-by: Khem Raj --- ...acros.h-for-major-minor-defines-in-g.patch | 99 ++++++++----------- 1 file changed, 39 insertions(+), 60 deletions(-) -- 2.22.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/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch b/meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch index 2575b59b5e..e13ac9d06b 100644 --- a/meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch +++ b/meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch @@ -1,71 +1,50 @@ -From 29c7a529d3bb0c1e20239f885e74c5036f1a908c Mon Sep 17 00:00:00 2001 +From 3c29a86f351ea4827dc445bb8e6cb774543c9be6 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 +Subject: [PATCH] include sys/sysmacros.h for major/minor definitions 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(-) + src/bootlogd.c | 1 + + src/mountpoint.c | 1 + + src/shutdown.c | 1 + + 3 files changed, 3 insertions(+) -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__ +diff --git a/src/bootlogd.c b/src/bootlogd.c +index 570d382..68d62f3 100644 +--- a/src/bootlogd.c ++++ b/src/bootlogd.c +@@ -35,6 +35,7 @@ + #include + #include + #include +#include -+#endif + #include + #include + #include +diff --git a/src/mountpoint.c b/src/mountpoint.c +index 9e3dd9c..91f74ed 100644 +--- a/src/mountpoint.c ++++ b/src/mountpoint.c +@@ -25,6 +25,7 @@ - #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 + #include +#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 + #include + #include +diff --git a/src/shutdown.c b/src/shutdown.c +index 7e997da..17de58d 100644 +--- a/src/shutdown.c ++++ b/src/shutdown.c +@@ -40,6 +40,7 @@ + #endif + #include + #include +#include -+#endif - - int dostat(char *path, struct stat *st, int do_lstat, int quiet) - { + #include + #include + #include