From patchwork Mon Apr 23 12:31:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 902914 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:400c:c0c::23c; helo=mail-wr0-x23c.google.com; envelope-from=swupdate+bncbdd6bwv65qpbbyve67lakgqe4badqby@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="TghVd3T3"; dkim-atps=neutral Received: from mail-wr0-x23c.google.com (mail-wr0-x23c.google.com [IPv6:2a00:1450:400c:c0c::23c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40V5T2493nz9rx7 for ; Mon, 23 Apr 2018 22:32:38 +1000 (AEST) Received: by mail-wr0-x23c.google.com with SMTP id b10-v6sf18776388wrf.3 for ; Mon, 23 Apr 2018 05:32:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1524486755; cv=pass; d=google.com; s=arc-20160816; b=qPwLr0cCHOVp0/doSkuiuiBUnf83/g2hxyYOB9a+pCShgfMDPwnWf9pZE65AjYWwYz QfniZrY5S4h6dfPSqSAkWYt7pzh4Xl3LblpwKNHObS3Z/D1NmJ7lOy6dMcLiGPgnUhZV 8jr530GTkr8y4y2RYrJiHKltYx/Xg3gV4S5teX2eoNTiTtj5euwlnUtSwTi8TdYFOImE WNW/jssEXj6QQ/s3tstU0mWMKuZrFwUM7t9jWQCIN48KYpAoIsOz4QG4wkjKfiXAL1EJ T0y9IQ1L4um9RGZ47ntpQtMrbeDZX4j5lwQwys7GTIFyZGMHIKBBT9OQcvBr3iE+eQ81 bnZg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:message-id:date:subject:cc:to:from :arc-authentication-results:arc-message-signature:mime-version :sender:dkim-signature:arc-authentication-results; bh=casIgn2qfhW6I18UM9CMu/03n8pKT3Qpfgzu0ED+9SQ=; b=0P5O4KfMRcG8ioy4f1Mgopw2/naeEnHvgqymO+fOyYT75HibgqHgHUKxX+39x0qO+y 5kVN1jcC6NeVg4tgaCzKfvNk0SFVXRTFEP2rbUuUYEfzhjgHaZpZqSJV97h15Qs5hkHm KE5lEYoNVYiIru95MvrPPIrn9ffLPwGsK3nxkCuOIpaVAskRWPwaelTj74VgR6yaZMim RtftpVgCZM4MiNZkX/9xk2RXK74d+2+JTGak+0TeBY+dHqhdqpwEdVb4bCD1JhXAeZBL SKWZ4iLMJ3ctUeqyRbdtj8CYcalL82+1laY9pf5gAwaJgkrGDmDJ+14caf33Ud6t4tsP fPuQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=christian.storm@siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=casIgn2qfhW6I18UM9CMu/03n8pKT3Qpfgzu0ED+9SQ=; b=TghVd3T3lgksU0ULDtkJbO2hPjf2X7gThVyxQf70pNCB2chqU6+G1W2H8YrV0g/kJZ scX9KeAxGVpV0N/NBLw+Yn3beBYuyVfMgFYg6dRjSudEayWpDfMWD9GyhGtzqZmWWqer 5y5DO13xfDuOpM/0tDzkrvxgv6pAW1qBFm3uYOLN+eHN/BknYiCECJoZd3ACbejiWTSH CwJDYV+JkP5gWZUz78wcETQ7dQO3E6qPVv32mSkuA6Vt6ZCblKPoFZa+b4i22QH2hDyH pQ0UAIQV2Wo1KHBs9GriqySQ9hn5afZF1wCP9v+8qTAme577qm+BFUWK/3beIvI69XEJ QPiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=casIgn2qfhW6I18UM9CMu/03n8pKT3Qpfgzu0ED+9SQ=; b=k645LPgo+WbgiQuF8vzQgwncRgi7LV3cHLQ7BbrcNi/N26PlR1BLVuwd5HE6a+ANA2 PL0aPDD8xt8AKBxejesCW49ZqH3tbwuFFt/z1yTuj0bT5zsUF1Enb3Z/cCk1p3V0Osrf /QBfE1v8vFAVN88C237IPIOlFRXb8MEcr8Eu7QUYjDJYBcomH2452ao36s/LG4yub27y sLegWWpEYT4la/n58+BaUgabWKpPQuXScQBlPj0ikPceplEVJsu20vdAwH9mzzsuHm7o Urh9nhz7cIyFcEZKiNWwKJSz8XQ3P5OnO7NRXe0HkxTuJvwHurqyM85mGajSxHly6Paf SgTA== Sender: swupdate@googlegroups.com X-Gm-Message-State: ALQs6tANOi+INAe2pG8qdq96GFUcE1JzEp3ahRs2jP83eyUtS87H7JN1 rwSNZHJP+cTAMoxIzZjf7oI= X-Google-Smtp-Source: AB8JxZpUhcsAK+eUN6f3rpaF+dLssl+rowe1E77KnXXJCplj6f+LbpijNdM9zEOmLFMJ3lHGbkEHmQ== X-Received: by 10.28.5.199 with SMTP id 190mr138620wmf.7.1524486754982; Mon, 23 Apr 2018 05:32:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 10.28.158.85 with SMTP id h82ls1871982wme.3.gmail; Mon, 23 Apr 2018 05:32:34 -0700 (PDT) X-Received: by 10.28.48.74 with SMTP id w71mr1263715wmw.0.1524486754382; Mon, 23 Apr 2018 05:32:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524486754; cv=none; d=google.com; s=arc-20160816; b=hhoNuHmdKdF0PhQvUhMhV5k2GJtWaMTMlScKQr+go23nwClGoRm+lTY0PoY9PMSCg9 DI5dyux+iL6zvE8L38Jq4UdBf5Mf1RmQKBD27uNI4KrhQRe3wDGbDJ66PfSAlNnFzDAV vjJQ449zoBPLzJEN2hoC2AdcTrZdI4lPfQR9q0kLHoPIoDmp+BlZczZBSPTkChH3bnhA Gyki8E57c3ASLoa5qkGX963tX731SsR6Ret9R6K+lNxt6z6h9WjaR68SievdfiRUOh00 kN0g5s6jZsOPC8rBuR68kj8DAnY5T2SOVGv5w5olDMb6ktfI3DckhKnBbsy+2i5QSl1F BX6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=aJ0IaCeKLSZ+LFgcgVhGunkBAnGCCpkJPV8BS8V2wAo=; b=Hi9pmvqxbkC506u4HGQrkGmnebb5WYzhV0b9pSQKRDOHJ7h2OgrohIcVAtpVvgmm7k Yi0yXVXBebuRhEl0+ibJVBJ7vAE3DAdiAIxT5kw2KkrqmyOn+eLOYbl0KWEz9nCWk8wO Ed8GG+xjDRu2egDvRELIfr1pJEwc/v3EtgNtMFz6l/GPAa7GwgQ6G1aC9y2ldSUCvtES Ju+Ts42gE18uVzSGeRrDG8w+i9IQIQtSDGxAxkANrT5D0OWbycGTyhYZCwbMtt7YWesi mAhT4Mfc55ANn9BwTTcCaOn8CSybs0Q4pPQ9seJPsi8zdxBOPHGd1iPz96B997jddFdd UNEg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id z197si377730wmz.1.2018.04.23.05.32.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 05:32:34 -0700 (PDT) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w3NCWXY2022126 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 23 Apr 2018 14:32:34 +0200 Received: from MD1KR9XC.ww002.siemens.net ([139.25.69.174]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w3NCWX81018649; Mon, 23 Apr 2018 14:32:33 +0200 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm , Thomas Zander Subject: [swupdate] [PATCH 1/8] core: warn about non-Linux parent SIGTERM tracking Date: Mon, 23 Apr 2018 14:31:02 +0200 Message-Id: <20180423123109.18590-1-christian.storm@siemens.com> X-Mailer: git-send-email 2.17.0 X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , As prctl(2) and hence SIGUSR1 tracking is only available on Linux, issue a warning on non-Linux OSes. Signed-off-by: Thomas Zander Signed-off-by: Christian Storm Reviewed-by: Stefano Babic --- core/pctl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/pctl.c b/core/pctl.c index e35741b..121559e 100644 --- a/core/pctl.c +++ b/core/pctl.c @@ -10,7 +10,9 @@ #include #include #include +#if defined(__linux__) #include +#endif #include #include #include @@ -135,6 +137,7 @@ static int spawn_process(struct swupdate_task *task, notify_init(); +#if defined(__linux__) if (signal(SIGUSR1, parent_dead_handler) == SIG_ERR) { /* * this is not a reason to break, just a warning @@ -143,7 +146,10 @@ static int spawn_process(struct swupdate_task *task, } if (prctl(PR_SET_PDEATHSIG, SIGUSR1) < 0) - ERROR("Fail to call prctl, maybe not Linux ?"); + ERROR("Error calling prctl"); +#else + WARN("Cannot track if parent dies on non-Linux OSes, sorry..."); +#endif if (start) return (*start)(cfgname, ac, av); From patchwork Mon Apr 23 12:31:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 902915 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4010:c07::23d; helo=mail-lf0-x23d.google.com; envelope-from=swupdate+bncbdd6bwv65qpbb4fe67lakgqepwnldni@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="ct8eB6In"; dkim-atps=neutral Received: from mail-lf0-x23d.google.com (mail-lf0-x23d.google.com [IPv6:2a00:1450:4010:c07::23d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40V5TH4z39z9rx7 for ; Mon, 23 Apr 2018 22:32:51 +1000 (AEST) Received: by mail-lf0-x23d.google.com with SMTP id a8-v6sf2755136lfe.12 for ; Mon, 23 Apr 2018 05:32:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1524486768; cv=pass; d=google.com; s=arc-20160816; b=ePoBPPAwAbcfFSh/v9G+rLNsH6Q3KvkIakwarLA2SuD+WwpP7zEYEA/fReCaqIe4iH eW5f4Bf+hG0XQY0th3EL8g9tSecIS+sa6GqCQXzuyLfaYFU0HNsA7KQTjTINfE65mcdw AM8jc/CiWan8OQ2J8X8/WLTBhEhCk9aX0evVlTekO7RDTLRRU72Vzh5cgO26YFLjt3d8 GrpfUV7TLsZjhl9w+KGe4LXSQn2JZRr0ACOYJ6V/n1VAmX2LreUw+cDlLWxamSEojPnJ m9VJCMvIHfeebso4tRz3S0pLwRyvgnbkpkHzJqZu5Yg+KPdcdN9OIBt4MVZ7QCKzF882 ORWw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:arc-authentication-results :arc-message-signature:mime-version:sender:dkim-signature :arc-authentication-results; bh=SnD7TRJ6pJs3F14mI4XeiQxhSbQ9uFRi6chqQwNq/EY=; b=TImSEYwq1v7rXKemiDbFlFnlKEOC/8Urx7H98o4jPNnfOfPVO6gYA+Iu67qKYQxSNP 2IKx4nLvXqHghw3sftA6GMqi41tuo3bcB9yU4authYFPqPNzDzY9ZoGKPTRDroeg9ILj bauznGA78WZbX5Cd9QbEJjiuvlwz/8AI3ZoyoYKzYXZF6S2kKHh2Xj4T6YQ2X/lpIW6j BlRWZQejPfAD7kAue53+NhZ66dnQiy0g2+yg7YJ/qmc0SCciDMM5XJ0pOZOWs3/R8NtT aLS7FQ1Zadnauz93syn9vyOeUvznYcLbYuY8kn0QrIWyeGi2Oq2n2eaGAimBSIvau1i9 3DLQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=SnD7TRJ6pJs3F14mI4XeiQxhSbQ9uFRi6chqQwNq/EY=; b=ct8eB6InBLCNQsX/Cf1a1Mmovua4URNyjXB7cJYh64fps/Z9bIE2buRKKpUY+119hd sfyXyQbjHy5JqUABZ3hZN8fjygsFPs2ImQ2rd8ZOd/T4y3VUJC2pCakoWVks+2D4I7RO ohCQeRaCieTIxWHNgYOwk0NZR0PjWDrillV49t/s01D+zlFF4K8Ja/EPhVOXXNMew2w/ wx4aeSpwPf5+I0l9z0ZP8HHB8N1REr3UMm0bR5HghJHjnLWtRckjPMiU42/yM07/H7Wd Fv7ef7Sek/t07XqUMYDgdVZZIaYV7YtFuzawA7/H9Yc2sQbxWAL7cBneYssQZp3RwYcT NJyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=SnD7TRJ6pJs3F14mI4XeiQxhSbQ9uFRi6chqQwNq/EY=; b=idRBAh2u4gGDcn916k4GsZ7kwugAeuU8GPT6FlyPjDvOe1XOrO9obcOUsqlfPab91X GTL6vHgNXA3RnGNRpTC6n19OhrjTL2hQyyD0E9oz5FW1MEVRchuIO/T2G2NJwLuO3pBx fRQlwPFpdxUe8OCstu4zqfAtxY4AYZ5hshYwMK4bDK1EvaJhCBxGhNPYUmCkVWnCVp4a fW4Ewz2vuaVcd7wrN0Q9PgJ2FOYnVPHKZ/PH6MGNheUD8yXELYJ2s9Be/ICWvxFGSHgV JWjjY07zUiHF/6j4OfMQA3nbu3NBATwhgYcaX0tUvqpJ5ZR7pifncoQ7Q4Fz+gjS9mv8 q90w== Sender: swupdate@googlegroups.com X-Gm-Message-State: ALQs6tDpA/jpp/Tel9m4WWZ9lqflL/AcHZ8zsUdpISUITBRn6TWvbUIe rq5UAqyDUqVM998QKPJUNVY= X-Google-Smtp-Source: AB8JxZp8/51DMmk6MzA6qzFsSxI6GGRCMOyzGoY1/BLZpD3RPtyeYEj1ZdIZX+IpNTg07PjrSTzwZQ== X-Received: by 2002:a19:d286:: with SMTP id j128-v6mr42156lfg.1.1524486768660; Mon, 23 Apr 2018 05:32:48 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 10.46.155.7 with SMTP id u7ls469128lji.16.gmail; Mon, 23 Apr 2018 05:32:48 -0700 (PDT) X-Received: by 10.46.156.12 with SMTP id s12mr1221701lji.26.1524486767984; Mon, 23 Apr 2018 05:32:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524486767; cv=none; d=google.com; s=arc-20160816; b=M+x+9/RPqc3QYuyOnrrEJmMZqKU/8LORCSmd3x4/7VoiadDYoTjo3tbMlm8l/xaxfs sdeh1J354l674aH9YGjque4kmcusnT+kfMVjB7Ro2wFIwnTW9D+qavu4IiiX9F2FzoGO AwXqeTdU8Rrlrtm5NevDDlT0bKAqR2cOd+KBNbDe1qvFfT7x3MtgvG03Hk8skgj6Vh0M 6C6vDvkyXl5r2PkPGfogDcnlBcLjUasDx99NK0m3BGaeIWy/nU+8u573vfQc3TO9yVzv Dv6SJqE9yulA2ZW/5fRom5qmOu7HZn1tWTlxL0R1Mg6ftCR2o2firkM8nObn5kcKDiwd AnQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=SZFHAecqHTbdf+1x4T4fL3tRgEvItDep55skemOx+J8=; b=0trQSxu5glcVuDudadsIwiOotOon4dBzUkB0oVBCo63BuTFVX3Qe+z97ETIf6Rpubc YcFIMLTdXmIX3nsfmMob8Fb8CRqENrF/PYBCw5uMDCTC6BkJSpBFtV5GRc4dz/ye7+Xw bf/ZNl873Qyyw3wRtuCIZ1HDs5egsBal5CF+ubKGpDh3PoY3DMUN+p4V5x3EKnFyOH/v AEbdaooHnzFOUNTEqzJIUZRcYA8BSoje5KQF6ThX+GtKIWqj7EUoeHeo7r9l2BuKdULS hvxvxyDIDyGjPExfsvN1aajqeVDBSjqMhvvmMP1Og0ncRLgdq/zmhcbR+E2BfasWQuJq 2yGA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id f9si593831ljk.3.2018.04.23.05.32.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 05:32:47 -0700 (PDT) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w3NCWlvJ015900 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 23 Apr 2018 14:32:47 +0200 Received: from MD1KR9XC.ww002.siemens.net ([139.25.69.174]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w3NCWX82018649; Mon, 23 Apr 2018 14:32:47 +0200 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm , Thomas Zander Subject: [swupdate] [PATCH 2/8] Makefile: use "cc" instead of "gcc" Date: Mon, 23 Apr 2018 14:31:03 +0200 Message-Id: <20180423123109.18590-2-christian.storm@siemens.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180423123109.18590-1-christian.storm@siemens.com> References: <20180423123109.18590-1-christian.storm@siemens.com> X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Do not hard-code "gcc" usage but instead rely on "cc" for portability. Signed-off-by: Thomas Zander Signed-off-by: Christian Storm Reviewed-by: Stefano Babic --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a1ff4b1..54af2a8 100644 --- a/Makefile +++ b/Makefile @@ -114,8 +114,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ else if [ -x /bin/bash ]; then echo /bin/bash; \ else echo sh; fi ; fi) -HOSTCC = gcc -HOSTCXX = g++ +HOSTCC = cc +HOSTCXX = c++ HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer HOSTCXXFLAGS = -O2 @@ -172,8 +172,8 @@ include $(srctree)/scripts/Kbuild.include # this looks a bit horrible, but 'VAR ?= VALUE' preserves builtin values # rather than only user-supplied values from env or command-line $(call set_if_default_or_unset,AS,$$(CROSS_COMPILE)as) -$(call set_if_default_or_unset,LD,$$(CROSS_COMPILE)gcc) -$(call set_if_default_or_unset,CC,$$(CROSS_COMPILE)gcc) +$(call set_if_default_or_unset,LD,$$(CROSS_COMPILE)cc) +$(call set_if_default_or_unset,CC,$$(CROSS_COMPILE)cc) $(call set_if_default_or_unset,CPP,$$(CC) -E) $(call set_if_default_or_unset,AR,$$(CROSS_COMPILE)ar) $(call set_if_default_or_unset,NM,$$(CROSS_COMPILE)nm) From patchwork Mon Apr 23 12:31:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 902916 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:400c:c0c::23d; helo=mail-wr0-x23d.google.com; envelope-from=swupdate+bncbdd6bwv65qpbb4ne67lakgqetcs3tga@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="Y33YlA1P"; dkim-atps=neutral Received: from mail-wr0-x23d.google.com (mail-wr0-x23d.google.com [IPv6:2a00:1450:400c:c0c::23d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40V5TJ6Sjnz9ry1 for ; Mon, 23 Apr 2018 22:32:52 +1000 (AEST) Received: by mail-wr0-x23d.google.com with SMTP id u56-v6sf18097169wrf.18 for ; Mon, 23 Apr 2018 05:32:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1524486770; cv=pass; d=google.com; s=arc-20160816; b=ov89XwjvCsWXxnxZ6XJbDQHXkRLu57JbK9N5W6tTets36qRBlEx7M8+odMJyGhKbHV PSWhcglOGM8SU5JxCV8I0OZ2o8OUv2qsAwuhyCJF0cGa6jg1fPoKSkRZx09JF2O4UP3x fCNp8d6RXx7sbSeUHx3NfVkZgpq+6GYSoonLwX+yUr70TmbuiCeoG8xsMH4UYfcGcYee eyQM+kzUo8YU/6ZE5nzeqs1ydeLH/PV5UJ1Diy3p0fWppd0dhQsTjnS3un2Mo+rzlkGI X6aEDxJlIVovKYztaBOV26HbsfQvjDAoUlLVWQ3O8eBQpJ/g6UIaU6lkXPWAplUYaGoQ VGZA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:arc-authentication-results :arc-message-signature:mime-version:sender:dkim-signature :arc-authentication-results; bh=F31jhQ2MfNMdH5K/BgoSJsAxhzeKEtH6/uWjWkbscxQ=; b=brQN/FGLzJgr6RfXT7u5mjaijcaqhKsu8QRYkDHkHWBdogwQT3OzcAA9oLDbevSNCV 7DicuAqi1lvphd9jaRL5N9eq2WbmA8/8lIo2LWy+j7GzHmAHSlUsSjX20sFpFjqlWxrS QwOgtR4umGt+hsbefOK9dClqRp+t7hKmUGupywapMSyqg20QUydn/cjzOL7IUEqBWuw8 iYP1q8g4T66QbovbVHyfBlbaQBvK5t2RusZU45zQQSA6XMFbNjbm5gEVVHdkQReh6PjD quPKcyfNzLDNW6xDsa6uWCrIZMGBB5eQMso7XPpDvUR1C+vq9pVG5NUnfsXJTvzsGwQ2 CGEg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=F31jhQ2MfNMdH5K/BgoSJsAxhzeKEtH6/uWjWkbscxQ=; b=Y33YlA1P3syOGqZBPIX9Jj2ZrgRQW2bu4kdS11bJURsxXF+3TbmLrU+rKj4kGLBpto 3xX6PZUpXOhkJ3f4WAX0jpRNevbfuyCaiBGKaCUPzrJ54wsAbYxeHxE9OwrvnK80gbrm KP12jVlf3EMZmbZt4NenUxfwU7YXrmWkUZEXhF2NupqHUIyfcciLQ5gQIZMq/yJPZFjC 1Cl/RAtaXhDZWZ/vr9c36DpRFj2HTPrPozDak771QMLIybVQWfDrn9N3pM52HxKQ2tod x5556kaKnV3cnaN7t7mJ+87U1S+QGzSLZdxRrFJZ6A9Pz8y1DjEcDYX4M6ociLa4ksRj zKKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=F31jhQ2MfNMdH5K/BgoSJsAxhzeKEtH6/uWjWkbscxQ=; b=c0aWQ4oxDY8tDK5YtxbKHClFxeRZCLEK/xHAf79lXZBULHLlnnFCryrxFe5U9eZbQH K1fRtvGHWx5dfTnEjei2qoX5FnhfIHPplObS2ObBMrzYCSvkpKsfzMrNTgTNW61BzoBb MMMt9dJRNdIz+O8PgtysvyDuyMcHiR8qINvjw8hoj0fKB3ICRSlZgmHN+ijQYLRdYzOl 2eD7fJQfFvHaWfnjWdgtlIWLJLnnYfXLFpoGYVp0VrcILrUID5dlzoPHfuh3x0LLzvRU BreUNrosVRNFhpgDOD9i9OL6iJHC50Av/vDMUeNtUoMAi6zPBCyfgmdfhmZCDGi1MvHD obfQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: ALQs6tDFSuoUlljcoQbKSxidXYwKa5culaLr654QgPDzb6VRWocS+z00 WV4uKytWEK9m9eRosEIuFEY= X-Google-Smtp-Source: AIpwx49IBj3Ma8MBZxqkkouMFnxjy9Z4fpBLe4iNxO8T/eT6vbL+RTyc0ZBsoxxqWLGdZmVsxix1AQ== X-Received: by 10.28.54.4 with SMTP id d4mr49134wma.1.1524486770119; Mon, 23 Apr 2018 05:32:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:e286:: with SMTP id v6-v6ls4258409wri.9.gmail; Mon, 23 Apr 2018 05:32:49 -0700 (PDT) X-Received: by 2002:adf:bc03:: with SMTP id s3-v6mr1625204wrg.27.1524486769611; Mon, 23 Apr 2018 05:32:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524486769; cv=none; d=google.com; s=arc-20160816; b=b8FR5QmJpJ/yPS5KzSlHS2AdzsG5lY+VhGT3n8eehf1BeXO3CBVj+OCCmca0GH4ujY 1L07eEMg4THVldyTyud8XHVt9Bk8fS/YijSWiivZc8LValKWxfsJtRn0oSQD0ThcObwg 9drWoAEdQY2NgY9eB0FEt33GpCADQD/5IGBjhfuZY2SnIIxvLJVD7JWMKgojRtFWCWu0 8SeBz5LiVOJ2NBY8vm7nHpJn2KkoeOSIEnz4xwEAD6jW+RqT5zauAT2UiMy+1tf9+6qB YaeVCcY22EHj3iT5u79sgtJvDxJlfbn4+/HKNXWJ37p/RCYYUYxpdAoSk1UcgetxmnyH u8qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=VO2RHAP4UennQEwspr3aeIfBgm//ZTHXNHP1KwvMeQk=; b=yeWmNaHiO7g41+4+fgcqzxpBq5YZV470Hi3mOPgSO3TKaGHm6rrf5gTsfqVUO9TRjJ Rm9sBSTLDOMqu/19Mx645/dznPf9X3YjTRsKbf2frPJ4LJAWFf9TS0B3tNrhOfExjj79 qIHW5audBjoCUWPWijlb2NqS8Ta4fmtOHE2MtqzDlXHRUKu0H6GGfv1cTlBtWQsyEdMA ezi9Ewyw9ye10j1GtoGf+QrmgnNoDmSual10aMug9GZxJs8SBumHk64PTPtcN79FJ1ZC lo3K0wqzaDLje7tUBPwoYx4LWpK4DzvkcqAUwUq2vFjlPf3Lr76oIaaaxiCsd2GjuXmW lLyA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id y144si249857wmd.3.2018.04.23.05.32.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 05:32:49 -0700 (PDT) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w3NCWnh5001956 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 23 Apr 2018 14:32:49 +0200 Received: from MD1KR9XC.ww002.siemens.net ([139.25.69.174]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w3NCWX83018649; Mon, 23 Apr 2018 14:32:49 +0200 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm , Thomas Zander Subject: [swupdate] [PATCH 3/8] compat: ENODATA compatibility for FreeBSD Date: Mon, 23 Apr 2018 14:31:04 +0200 Message-Id: <20180423123109.18590-3-christian.storm@siemens.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180423123109.18590-1-christian.storm@siemens.com> References: <20180423123109.18590-1-christian.storm@siemens.com> X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , As ENODATA is not available on FreeBSD, return ENOATTR instead which is close enough. Signed-off-by: Thomas Zander Signed-off-by: Christian Storm Reviewed-by: Stefano Babic --- corelib/swupdate_settings.c | 1 + include/compat.h | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/corelib/swupdate_settings.c b/corelib/swupdate_settings.c index 9a5043a..ec726f2 100644 --- a/corelib/swupdate_settings.c +++ b/corelib/swupdate_settings.c @@ -25,6 +25,7 @@ #include "swupdate.h" #include "parselib.h" #include "swupdate_settings.h" +#include "compat.h" struct run_as { uid_t userid; diff --git a/include/compat.h b/include/compat.h index 29d7af1..a98a388 100644 --- a/include/compat.h +++ b/include/compat.h @@ -22,3 +22,13 @@ (char *)memcpy(__out, __in, __len - 1); \ })) #endif + +#if defined(__FreeBSD__) +/* + * Define ENODATA (61 - No data available) to + * ENOATTR (87 - Attribute not found) on FreeBSD + * since that's closest to Linux's ENODATA, and + * 61 on FreeBSD is ECONNREFUSED. + */ +#define ENODATA ENOATTR +#endif From patchwork Mon Apr 23 12:31:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 902917 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4010:c07::238; helo=mail-lf0-x238.google.com; envelope-from=swupdate+bncbdd6bwv65qpbb45e67lakgqehlqjo4a@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="hkbKBF+E"; dkim-atps=neutral Received: from mail-lf0-x238.google.com (mail-lf0-x238.google.com [IPv6:2a00:1450:4010:c07::238]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40V5TL5wgCz9rx7 for ; Mon, 23 Apr 2018 22:32:54 +1000 (AEST) Received: by mail-lf0-x238.google.com with SMTP id e192-v6sf3287686lfg.11 for ; Mon, 23 Apr 2018 05:32:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1524486771; cv=pass; d=google.com; s=arc-20160816; b=qoeDrv4T7KHYH3AIZXai9bxyfC61VhKfbqyQ7qlyGgVdGCfyH9/LUnZQ2Hj4YTcUIl 4mxYjdjUVsWF9jghgW2OcRkp7ovlBtOFu2+7i1C8qAnH9QmMoDe6/JM/+Wksu6dSU0Jp mITzKzQCMpP377cL/min6Vf5cizbUuBo2Jc6bD1fXGR0QmnDenzroxZ26yRvJnf7p9Z1 xpxE6X7XMte+Ta52XOsK5/9oQ9NnZVApJGMCDMiUgA9SwSbr5XeF5FaFrhcZKRvV4Nin GHxTwy8nZZWeijVrATQAd4jI/n5Ww+IRwZmlB6/p2aZreKlMuLGnlO4Kjc58Da7avNWD 9Bzg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:arc-authentication-results :arc-message-signature:mime-version:sender:dkim-signature :arc-authentication-results; bh=DZxRlEpdJNSNqbcKuEt480ySRveAbLCzgOLB5DT2yyQ=; b=XnoXIL/fp2ulg9Whf9601HBmDIOSxzBjzq3+cz/dZyP3VpwTiepehAEuwjDSY6FZml EgFH78bwIX15kWgm+sbnBA0GJ/q2IBsKCGZUphcX32eGoA4wT0a6scUORY9yqF2y9AG1 /1hlZPPnQ+bwUfHfXzsnXJnKg4hULToLfHTNTgUD5uEKCMy/mI/cZqUsDvdS7jpYmILb dayIhvME8ZGkOo2+g+wNoOU6ZyPjSClvuw19wLPYoWdwW4tG5dcdzBTMl5VhRvt7YGWj CIfdpzsq8Cyppbm1KLiO7Nbma/SrnrhON0nUFp5U+uMQ8W75Xfl1/6cfzDxsGlsuIeQC gYrw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=DZxRlEpdJNSNqbcKuEt480ySRveAbLCzgOLB5DT2yyQ=; b=hkbKBF+E4tHoZciQwhjZLVzXsqNG3CFXAzkYTiCT0VUdnhTNksuMZG5vwZ2Vc3Nfnn 4jyorQh1JBhYric9mITzUxGNwlSBPfaGCiNplx1XjDnXEtHeYsok2zuLaWl0joqQkk7r XH6FupIC6A37sdPeDKhJqkUV/3Yg0RR9fGscG0SFdqwe/j7tK0nddW2K2hoIm7WzvDsc C0IXdDZ0vR+0X3aRcdrpvfSB2KhDQa2bPF4fjjQPBfKY8LagrQtRWg5yVJxs305NhE3V YZewCxbkg7aPXfPQYvN1qGDKzmyP4GwPjaJucH0CgBIXW1Jm27lrSzkRoOKTWcSahQa4 sPsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=DZxRlEpdJNSNqbcKuEt480ySRveAbLCzgOLB5DT2yyQ=; b=BDiyn07OeMuXszvZwOBfKKFjSn7/YOmVTAEi6o89IFiGSlkiCwlwDJdSyha3glIOHd oCkvO3LV5fm/+9nmCBxMkRMuX6gicHJMaGLy05WxCeQrr+np9+1KgfaeJ1H1LJ3C79tE ZvMzkvm7pZtFSzTZ81j01Shs8zOII2rMrGb6xff5VyU624zqhAQSrYBTDuxkpNzttKzw GiVEUMmGS/En9uTOtHZrSkYusdCLiiIUCwIwta7NtOhA5/OWH2LZrZtk6T+lkkoxgq3W ivWR+r5xBilEAgcMZga/BVc2KKAfeibOH1O1KThZR6vHoKVUW5v8Wf8mgLuiod4panTN bnqw== Sender: swupdate@googlegroups.com X-Gm-Message-State: ALQs6tASwqbhihS3cF3sbqGz2aALfRvXfCHAtPHdMu1xH1OtynE0djeH xn52xTqtiBKOrQeTNSDdr5Q= X-Google-Smtp-Source: AIpwx4/j8YER30+Z5wKGofAxApDBQjVFV1ov7m8sSXVTC0ZFgZW34gtPMKsguAcDHhQfEgqZeAU99g== X-Received: by 10.46.158.88 with SMTP id g24mr63965ljk.12.1524486771943; Mon, 23 Apr 2018 05:32:51 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a19:4d53:: with SMTP id a80-v6ls793803lfb.2.gmail; Mon, 23 Apr 2018 05:32:51 -0700 (PDT) X-Received: by 2002:a19:d48f:: with SMTP id l137-v6mr867058lfg.39.1524486771407; Mon, 23 Apr 2018 05:32:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524486771; cv=none; d=google.com; s=arc-20160816; b=ECQNdu393WZMw+Aa+VsoWbQWewfnePzhYXhzW6u84iLzcBixGiVGp2hFib4ving288 h914lElThwon0pQzzkeQS9Zxbsy/ywMl9DFV7JsPZoPcZ1uw7MBCKWH2q1hE4EPVlPQ1 Lp4eNER5iZVHZDO9ohGy6xF30UHooFN4MPRiFWLn3DgmhG0/hvwNQNNyEcUSdovdhRlB gR6oEe5LvbJJPuLWsVNhc3Q5fonpBx5JqilKJJAoQk7/ZZnxv9aToDlynqGwzFfrt73k eQ+7hXz1OCygiaQaPvLcoirvf+o7ClCR+onOqBWYqqcYqMmnNY2Gqz0oqZN1TbdMJt9p 54Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=ibWvqoH7B43a717tHhjCrt2mwfCcoHyJp3Iq2Gaf13M=; b=qQSkGhV7ofm1tZBtAP9dmXn7w/YeieK6BIjyST0StXuYX0gnqr5D5yNUZw0dPU5Dst i7LQZqxKTEtn/NJL5+swA7ZzK9OFh2s0cvSoAtjRqz4iiolDQXG6Z3ItXL5YuUTi4o3L w/dCnEmnSroAJgOFLW1E5neIIb7e4obmR/jKTMyUHi99TDOZRUdXEuSpVidlD34DfC/b qAknTAT1TteUSdnWJyZk3mS2B/9zQoSTMJygzVZUNIGwlNvMBQVdPiNEtlFbZ2fh3D9b Bj8c/2mJ4Pnh7XaP8lfyG8D2dvxYuzdu6Q21hd3iyQOYWcrWMDLhAPqCEcJVcdwx9KCF 6zIA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id a141-v6si257955lfb.3.2018.04.23.05.32.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 05:32:51 -0700 (PDT) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w3NCWo0h016085 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 23 Apr 2018 14:32:50 +0200 Received: from MD1KR9XC.ww002.siemens.net ([139.25.69.174]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w3NCWX84018649; Mon, 23 Apr 2018 14:32:50 +0200 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm Subject: [swupdate] [PATCH 4/8] handlers: remove unused mtd-user.h includes Date: Mon, 23 Apr 2018 14:31:05 +0200 Message-Id: <20180423123109.18590-4-christian.storm@siemens.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180423123109.18590-1-christian.storm@siemens.com> References: <20180423123109.18590-1-christian.storm@siemens.com> X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , The archive_handler as well as the boot_handler don't rely on mtd/mtd-user.h being included, hence remove these includes. Signed-off-by: Christian Storm Reviewed-by: Stefano Babic --- handlers/archive_handler.c | 1 - handlers/boot_handler.c | 1 - 2 files changed, 2 deletions(-) diff --git a/handlers/archive_handler.c b/handlers/archive_handler.c index 5773942..687958f 100644 --- a/handlers/archive_handler.c +++ b/handlers/archive_handler.c @@ -17,7 +17,6 @@ #include #include -#include #include #include diff --git a/handlers/boot_handler.c b/handlers/boot_handler.c index 7182217..791c7be 100644 --- a/handlers/boot_handler.c +++ b/handlers/boot_handler.c @@ -11,7 +11,6 @@ #include #include -#include #include "generated/autoconf.h" #include "swupdate.h" #include "handler.h" From patchwork Mon Apr 23 12:31:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 902918 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:400c:c0c::23c; helo=mail-wr0-x23c.google.com; envelope-from=swupdate+bncbdd6bwv65qpbb5fe67lakgqeoh3kiya@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="RozOhBHw"; dkim-atps=neutral Received: from mail-wr0-x23c.google.com (mail-wr0-x23c.google.com [IPv6:2a00:1450:400c:c0c::23c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40V5TL6YSLz9ry1 for ; Mon, 23 Apr 2018 22:32:54 +1000 (AEST) Received: by mail-wr0-x23c.google.com with SMTP id b9-v6sf18758740wrj.15 for ; Mon, 23 Apr 2018 05:32:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1524486772; cv=pass; d=google.com; s=arc-20160816; b=M6se/mKN5UaumbRNUWTYI6MxVyL0JGLlzj6InH7BpNKES5cFLpqJIoSqvtb4hTR4cj dLydTsdRW70IkiOzw1FoDF1lxauOJH8hiMDY3g7w8p8CngNw+hg2oAGTaLMXv7xfLlPp 0O7NzQposmjusuvVWJjmaQ9Ki9dfXkVzBTO1aBwwOUoNuWSnDHjBpUBGuVLvl48e+/gT FCEbQgJLdCa8a8/e3YQtcIwn6dfey/IySQFfhtLasEW4TOam0VG2Fj96qpeG5LBzChn8 3DireLEprtSUFsPyva1/nA1e3pG1iWm/TX9oPN/ft8ltS+PWekFiD96A6s32q3wHVoLF 7eYw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:arc-authentication-results :arc-message-signature:mime-version:sender:dkim-signature :arc-authentication-results; bh=BsT8eYf6XiBWhyUUnS6xiswptxf+a1VbLg8gH8M5Od0=; b=hCmFSGMIWxAMIXkefSPsN3R1yfNjguhWU/9s5OlC4PQVZqEpMLfcFuRk3Yb0XRYtNs B/8pAG1X//BGQytdOOTY9Hz8D6k50WJ750f18Gz6sV+hHqbH0cNiBI1V8qJO2+v6Ye0S 1BkF0KnLSCQt+e2UxBYDO9q6dRitH7vNYR6Doo4EtaVT731fIugEQ0yr7APQsoKO9jV6 wMvm9d++r6fKi8ZOHuGbU6RbKjOI8t5nAaJlS9rroE2A++JTJCGivJEDxVtfVqjXWPVk WmSubLg+FjIAy0W4d1amauLKFBNbhPUx85WUt993bXctjHyrbOKkaAJoB+CFFOVPBbP+ xoBg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=BsT8eYf6XiBWhyUUnS6xiswptxf+a1VbLg8gH8M5Od0=; b=RozOhBHwf1CtB5K3GDyyW9+OyIaainHBPx93DTHh83anCyc3C0Cvz9sfTscH7pKfj7 BRSkklcN6VKCimvUzM/IotaCmkpzQfOk+uj089dSfDn09i7T23YC57TeRwtdrJUovYT3 I1VOHrM437DDAXBD+mG0CDNXwsnvQc5Ofz8YGiCQL7ImOZc9n1ufSuEFWgoHYWbNJUnK pl8NxxcPQU2sbWR+tFCbrQAYZkNZY3Bfh7E4aG9U0EWiCfT97WTOp6HiCLWkm4n1lSEb aR3b78JRFAiYV+zGMl5444Li9B8DXVLnOg2/R5iGAwUxMYq1OfVTu4z7AFdOOgeyP0jY bPCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=BsT8eYf6XiBWhyUUnS6xiswptxf+a1VbLg8gH8M5Od0=; b=DmZR6PK4bIZJDW3Hw4+A8sfPMNRif7TfCbZUrMl2C70t8R1sugDamn2G5obmlQN/hL F8nl6Zy4iZDCa72hHyUOkDrqinzIYmrKzaMVv3xRDU5Lk8UTyd5kJOhWuvLDXoxcm9Yp pWK7muw0ZLP9Gw+RVO2fd7nJcJm42aX2DhyEMO7RWfLgemNfvzeDBSN3Qaopf4EngUX6 87IEykos1mq1kpSP4/ny+7++cUqk+zpFImDb7wLqOf+/V7ZHl3PVyn59OfvSyQbqzQxI EIkbanjEImJajMm4KRWkhLLAZZFItTBI46XedQH0A+JkQOFzlsqXFbtrcGWRAjscke35 PjbQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: ALQs6tDIGYxmLbnxxAoiJ/LbjvkcQsDAYXHDq58ankucXTKJyTku0WG6 o8FXZU60rGvUzw89JCt83oA= X-Google-Smtp-Source: AIpwx4/mLDtSGbfZXaQhSES/0z9Eczi5DzjwPQmTQ6HbMTYJZ2t+YlIOgmhaFQtR4AHiAyz6viPaAg== X-Received: by 10.28.52.79 with SMTP id b76mr140348wma.1.1524486772726; Mon, 23 Apr 2018 05:32:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:866a:: with SMTP id 39-v6ls4250113wrw.7.gmail; Mon, 23 Apr 2018 05:32:52 -0700 (PDT) X-Received: by 2002:adf:8617:: with SMTP id 23-v6mr1734849wrv.11.1524486772256; Mon, 23 Apr 2018 05:32:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524486772; cv=none; d=google.com; s=arc-20160816; b=au3muMrD6XfHSp8nlFQe1rYyoFTyXRIkpuePD2u+FBR+URBoloQAjr71Km1FYtUeME nCePj8kcPHzQwsnb9K1wCwSi3Fk3Roks+y53mfZ1Q6kYynqu/4KJgP2HptjoLqe6oKsH 6UbeWvlpTVOHldAOG2QwYQ9/WhlXY7NjVV+8O8TrrpKJsO21g2d/G78bEGQ9qwxLvEm/ hax8jqE3YzFeybW5p7u9ce+WqFn84uQw9tmZrzlC8CeCDetbyzfipmzAr6YqncUhEmYm DxA5epoIeHLOapgRrkwOWl6eAKVZjH2Hp7i8XAfbPeNcGk1ViLs0BZWvkZ+JjUETp6hf HzKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=gzFY4RAxQYN9yRFf1lX4S8XRsH2Nmgaj1gnnQc02s3I=; b=bDc/qpxC1GjfVppeB0qHKfuNUdXS96kFbsdwUXpsNzO9G5/mKF9RDw9x5Ro37Wx7bI ni3mXA8BpZ5aHbmW4tzhExJbns8mGvCh0Fujv406NucbNWL+mJimy3m03eyvptJa1xei Lqk6ty1RK0C4a5Bv0s3v4yg0w8HqvqiKXSqkCXbwU0sMWBi7ZwSlKMhzE1TmGTSsnuDn rb8D1O1rXFXC/VCy6mHLsVsv19oFCAqw/V6xwNeCa1o0/Oikkwwv6pYRQCIcmPn5/BSG /J4VCv/8L9tm60tgpzvaA+G2MtYQi0nN99QJqGO2ha+AiRk1/lrbEPwPiEj6e0QnmNiy gT1w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id v1si345014wmc.4.2018.04.23.05.32.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 05:32:52 -0700 (PDT) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w3NCWpNm016159 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 23 Apr 2018 14:32:51 +0200 Received: from MD1KR9XC.ww002.siemens.net ([139.25.69.174]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w3NCWX85018649; Mon, 23 Apr 2018 14:32:51 +0200 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm , Thomas Zander Subject: [swupdate] [PATCH 5/8] util: introduce mount/umount helper functions Date: Mon, 23 Apr 2018 14:31:06 +0200 Message-Id: <20180423123109.18590-5-christian.storm@siemens.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180423123109.18590-1-christian.storm@siemens.com> References: <20180423123109.18590-1-christian.storm@siemens.com> X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , OSes other than Linux such as, e.g., FreeBSD, may use a different API for (un-)mounting. Hence, factor out the (un-)mounting into central helper functions that do so OS-specific. Signed-off-by: Thomas Zander Signed-off-by: Christian Storm --- core/util.c | 55 ++++++++++++++++++++++++++++++++++++++ corelib/lua_interface.c | 5 ++-- handlers/archive_handler.c | 5 ++-- handlers/raw_handler.c | 5 ++-- include/util.h | 3 +++ 5 files changed, 64 insertions(+), 9 deletions(-) diff --git a/core/util.c b/core/util.c index 29ab45f..d2a1c40 100644 --- a/core/util.c +++ b/core/util.c @@ -14,6 +14,9 @@ #include #include #include +#include +#include +#include #include #include "swupdate.h" #include "util.h" @@ -492,3 +495,55 @@ unsigned long long ustrtoull(const char *cp, char **endp, unsigned int base) } return result; } + +int swupdate_mount(const char *device, const char *dir, const char *fstype) +{ +#if defined(__linux__) + return mount(device, dir, fstype, 0, NULL); +#elif defined(__FreeBSD__) + int iovlen = 8; + struct iovec iov[iovlen]; + int mntflags = 0; + char errmsg[255]; + memset(errmsg, 0, sizeof(errmsg)); + iov[0].iov_base = (void*)"fstype"; + iov[0].iov_len = strlen("fstype") + 1; + iov[1].iov_base = (void*)fstype; + iov[1].iov_len = strlen(fstype) + 1; + iov[2].iov_base = (void*)"fspath"; + iov[2].iov_len = strlen("fspath") + 1; + iov[3].iov_base = (void*)dir; + iov[3].iov_len = strlen(dir) + 1; + iov[4].iov_base = (void*)"from"; + iov[4].iov_len = strlen("from") + 1; + iov[5].iov_base = (void*)device; + iov[5].iov_len = strlen(device) + 1; + /* The underlying fs driver may require a + buffer for an error message, even if we + do not use it here. */ + iov[6].iov_base = (void*)"errmsg"; + iov[6].iov_len = strlen("errmsg") + 1; + iov[7].iov_base = errmsg; + iov[7].iov_len = strlen(errmsg) + 1; + return nmount(iov, iovlen, mntflags); +#else + /* Not implemented for this OS, no specific errno. */ + errno = 0; + return -1; +#endif +} + +int swupdate_umount(const char *dir) +{ +#if defined(__linux__) + return umount(dir); +#elif defined(__FreeBSD__) + int mntflags = 0; + return unmount(dir, mntflags); +#else + /* Not implemented for this OS, no specific errno. */ + errno = 0; + return -1; +#endif +} + diff --git a/corelib/lua_interface.c b/corelib/lua_interface.c index 3212ea8..c4d29c6 100644 --- a/corelib/lua_interface.c +++ b/corelib/lua_interface.c @@ -10,7 +10,6 @@ #include #include #include -#include #include "lua.h" #include "lauxlib.h" @@ -698,7 +697,7 @@ static int l_mount(lua_State *L) { goto l_mount_free_exit; } - if (mount(device, target, filesystem, 0, NULL) == -1) { + if (swupdate_mount(device, target, filesystem) == -1) { TRACE("Device %s with filesystem %s cannot be mounted: %s", device, filesystem, strerror(errno)); goto l_mount_rmdir_exit; @@ -724,7 +723,7 @@ l_mount_exit: static int l_umount(lua_State *L) { const char *target = luaL_checkstring(L, 1); - if (umount(target) == -1) { + if (swupdate_umount(target) == -1) { TRACE("Unable to unmount %s: %s\n", target, strerror(errno)); goto l_umount_exit; } diff --git a/handlers/archive_handler.c b/handlers/archive_handler.c index 687958f..4999f73 100644 --- a/handlers/archive_handler.c +++ b/handlers/archive_handler.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -158,7 +157,7 @@ static int install_archive_image(struct img_type *img, } if (use_mount) { - ret = mount(img->device, DATADST_DIR, img->filesystem, 0, NULL); + ret = swupdate_mount(img->device, DATADST_DIR, img->filesystem); if (ret) { ERROR("Device %s with filesystem %s cannot be mounted", img->device, img->filesystem); @@ -241,7 +240,7 @@ static int install_archive_image(struct img_type *img, } if (use_mount) { - umount(DATADST_DIR); + swupdate_umount(DATADST_DIR); } return ret; diff --git a/handlers/raw_handler.c b/handlers/raw_handler.c index c2c96b4..ac8e47a 100644 --- a/handlers/raw_handler.c +++ b/handlers/raw_handler.c @@ -7,7 +7,6 @@ */ #include -#include #include #include #include @@ -55,7 +54,7 @@ static int install_raw_file(struct img_type *img, } if (use_mount) { - ret = mount(img->device, DATADST_DIR, img->filesystem, 0, NULL); + ret = swupdate_mount(img->device, DATADST_DIR, img->filesystem); if (ret) { ERROR("Device %s with filesystem %s cannot be mounted", img->device, img->filesystem); @@ -84,7 +83,7 @@ static int install_raw_file(struct img_type *img, close(fdout); if (use_mount) { - umount(DATADST_DIR); + swupdate_umount(DATADST_DIR); } return ret; diff --git a/include/util.h b/include/util.h index 2ac4139..6db0690 100644 --- a/include/util.h +++ b/include/util.h @@ -169,4 +169,7 @@ unsigned long long ustrtoull(const char *cp, char **endp, unsigned int base); const char* get_tmpdir(void); const char* get_tmpdirscripts(void); +int swupdate_mount(const char *device, const char *dir, const char *fstype); +int swupdate_umount(const char *dir); + #endif From patchwork Mon Apr 23 12:31:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 902919 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:400c:c0c::23c; helo=mail-wr0-x23c.google.com; envelope-from=swupdate+bncbdd6bwv65qpbb5ne67lakgqecf4rf2y@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="sVsPP9wa"; dkim-atps=neutral Received: from mail-wr0-x23c.google.com (mail-wr0-x23c.google.com [IPv6:2a00:1450:400c:c0c::23c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40V5TM4fJHz9s02 for ; Mon, 23 Apr 2018 22:32:55 +1000 (AEST) Received: by mail-wr0-x23c.google.com with SMTP id p17-v6sf18467331wre.7 for ; Mon, 23 Apr 2018 05:32:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1524486773; cv=pass; d=google.com; s=arc-20160816; b=XJ8z6oilRt2jYcC0WVlTvvSOqf9jsoZmLpUW1IBkyzZOD7TwskhKXMnsujEFpJnDsJ B824gajtfU4GCZWNz7B1JAcw+UhgN4444IuThvlo9GSbOhJk+QbfWqmnM+Wm4N2tFxGz VWs3Xzs1lwO4OYHlI8KETD0QlyxB3dK0UmV9f4t4JX9sYUBk5PIyb01X93aLIhbEPFsC 5nfgZh4CGxHEJkjhDqd1q9x7+N74FRlFH6l0clizP0mzeS0MgVaQxvJtClDJL7KSJZoG LA7Vis8rLkfD2uTsnjt9I+AD7QsNGFUSDxBgagT89ERndqTPjWxTOZYssrXHh+MHkGMJ 9QHQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:arc-authentication-results :arc-message-signature:mime-version:sender:dkim-signature :arc-authentication-results; bh=ssJRN/WECU74AcIK7o2P9NCqFbmsmlEpmK7Ar4kuNjA=; b=rw9Up+t19eCoCaaVemIpu/8fR8CJPoVrqu8NiFWhN71RKFFdwzkFBKUCtaKnRWt3x3 xLmBJDCPGxJNpMDI4GF+Ftz9Tb29U49/evFTx+ywierPFXvF0K5/NTNUVOku4jIn0pXq MgwRzeFAweXgMdP36eddIwJgZxWj76LMwJ2dSiyUyNlTwo7vvHfAjH3zoWy8non1KSq3 D5RVTfiva54oA78WHOw/fEpXUzGKWGJuB+vZ3OgW5ChjGECFi5f0reGdFxEbHl6sVAdw z1HdUpiGTigs9taMVm+4WAMCA05Ont7BfJ5e/yKjfPhEkw25XWQyXAjx8sXDmB+1rpC4 wSXA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=ssJRN/WECU74AcIK7o2P9NCqFbmsmlEpmK7Ar4kuNjA=; b=sVsPP9waE4aw+VuX8QuChbR3PrNahhvQQL7KMpANlAEeXXIN/wShelHpWa0bS4pl26 CoJMGIoSFN4QBIs8yirMYNk2M0tC66aL/oaXyGZN9eLZVjSSLcUZL1E6H8xmgA53nE8j cLFo757NyDkl2bz4EekVAbaETzlMG6jqrMnxUSuq6qBAGvTCdpTR0Svztq2L9UrVwYsd 01mVKOq5f1lXUi7BhfGcVTP43Vh+4ARyHzQ2CPPMF4WKs21gXfpf5q9lvHKNVLPjKPfR db/bYaO7VGasLTz0YD5Rc7bLneVeSLwo5nOnsIp9hr/9tzk2dl3lqk+Pev+bWOJgZMCT zrAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=ssJRN/WECU74AcIK7o2P9NCqFbmsmlEpmK7Ar4kuNjA=; b=HB9SeRTpPVkFgS1pRiqmIuy5Pc/rLNxpdyhdmTLst7y6iEgOyNFFA3AsRYhAr5j7Yp y7nDFlDhhkNOVWlHGLpKDealpK1DT+FeIHI2T74HCSXgXWWuSc8vXccRLm+h6xapnj9G tTWcUuk6qbacWmQyPFYWz1GcQoMGBnHz5gbzj5YUM+1P29rxcFsKZq0cUJKn71CCU4b9 U9HPUvrD/l338YuCNMRuXpQyILRGvs+WVdh/vvWA5SB1ZoGGcvm3eMrpty8NpRKbVjIq N+Nu5BpNtzyd5wHAKKZ4ayQUZ2ZBTJQXDDJtvyJskFteZAwAT/s3T+hx6no1v9S/S+K1 z3ZA== Sender: swupdate@googlegroups.com X-Gm-Message-State: ALQs6tCRunQimkTjS5rMmNRvOhi+jvpuF4Mvm8QyEq5K+qELZlIqgV8c PEr8NsSoucUOdtVInz8XxMc= X-Google-Smtp-Source: AB8JxZqJ7zbGvo8hgSkkTSmC7VfuXAG9Uq1NIFRFGVQFpUi9SGrVW8YP2sC0CJPLDfXPXynnCblROg== X-Received: by 10.28.63.138 with SMTP id m132mr138020wma.2.1524486773444; Mon, 23 Apr 2018 05:32:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:8423:: with SMTP id 32-v6ls2356477wrf.5.gmail; Mon, 23 Apr 2018 05:32:53 -0700 (PDT) X-Received: by 2002:adf:e152:: with SMTP id f18-v6mr1432759wri.24.1524486773016; Mon, 23 Apr 2018 05:32:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524486772; cv=none; d=google.com; s=arc-20160816; b=kRImo6q92eaXBvDun8ZWN0mreF10gnj6PUm0aGXswA3VBBMX11KdzmAvjSDreH/zZ3 VJHQ1kEn23Ta3YpIA8ONI0gh2/rzEKgE7rEP7+ZsukyixnqwF6o634HORjfZLET8jnA7 fI1tox67Y6gsEOFOewVMSqvXlb5+FDlyUicWPr7xVKVScoy/F7rcIpQvBYLd7rQwdukB pmTMfzKa3CtFUfI+ioDOb4+o1rA3xBYRoAfmY1LDBYHECTqE6jBFXQAsbD4/ieRrL6DM KB0+hDYS6l1P+YVyDqdiqpeQUy2vp4Bd1hmRFknI+F9hFH3GTfiqU1+Xr6k4n8GJ5Kvr oEuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=r3zui5XHKq12tY5Cum/G2xVrQ3uet4fWa9xZ/b1Pc2k=; b=aeOkM6a1ZPXWu2vvisUSOj0fL5hnHmhNCBLYQNu3cAnWRGQYDZC/YtKyGCRWkl8axe IG/C1hI97/Y5I0GaAKe3uv2uy/jh5+Sq7vJETcJEJYwXa6Iiks/YwzNVXWzxSbx0pqqh At3rAWVmZMf24Ku6MpGvii/bL8QUlYAMoSyfayyKwdGEeUqLU4HHgWkrLVmq3EnzeMay Yp4qh8cKIOxAlj/+e+xLK20HvjmMKmz1DXlKBkRTM52G6ES5DQkC2PR6pflcLm0mxp77 mxs4eeU3qQFaEw8utcqpT4DvSPqEqs0g6Z2JUMGpu5ljM3FzSgDarxgRZaRt5xVRCT/M BUhw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id p21si390459wmc.1.2018.04.23.05.32.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 05:32:52 -0700 (PDT) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w3NCWqJb002060 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 23 Apr 2018 14:32:52 +0200 Received: from MD1KR9XC.ww002.siemens.net ([139.25.69.174]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w3NCWX86018649; Mon, 23 Apr 2018 14:32:52 +0200 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm Subject: [swupdate] [PATCH 6/8] Kconfig: add HAVE_LINUX property Date: Mon, 23 Apr 2018 14:31:07 +0200 Message-Id: <20180423123109.18590-6-christian.storm@siemens.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180423123109.18590-1-christian.storm@siemens.com> References: <20180423123109.18590-1-christian.storm@siemens.com> X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Introduce the HAVE_LINUX property to mark Linux-only features as such, e.g., systemd and mtd support. Signed-off-by: Christian Storm Reviewed-by: Stefano Babic --- Kconfig | 7 ++++++- Makefile | 6 ++++++ Makefile.deps | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Kconfig b/Kconfig index 1bce6d4..c7d1d5c 100644 --- a/Kconfig +++ b/Kconfig @@ -5,6 +5,10 @@ mainmenu "Swupdate Configuration" +config HAVE_LINUX + bool + option env="HAVE_LINUX" + config HAVE_DOT_CONFIG bool default y @@ -75,6 +79,7 @@ config CURL_SSL config SYSTEMD bool "enable systemd support" + depends on HAVE_LINUX default n help Enable support for systemd's start-up completion @@ -160,7 +165,7 @@ config MTD Enable MTD support. comment "MTD support needs libmtd" - depends on !HAVE_LIBMTD + depends on !HAVE_LIBMTD && HAVE_LINUX config LUA bool "lua" diff --git a/Makefile b/Makefile index 54af2a8..52b3b1e 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,12 @@ NAME = # o print "Entering directory ..."; MAKEFLAGS += -r --no-print-directory +OSNAME := $(shell uname -s) +ifeq ($(OSNAME),Linux) +export HAVE_LINUX = y +else +export HAVE_LINUX = n +endif # To put more focus on warnings, be less verbose as default # Use 'make V=1' to see the full commands diff --git a/Makefile.deps b/Makefile.deps index 1a01ca0..c49fe83 100644 --- a/Makefile.deps +++ b/Makefile.deps @@ -15,7 +15,11 @@ export HAVE_LIBCURL = y endif ifeq ($(HAVE_LIBMTD),) +ifeq ($(HAVE_LINUX),y) export HAVE_LIBMTD = y +else +export HAVE_LIBMTD = n +endif endif ifeq ($(HAVE_LIBUBI),) From patchwork Mon Apr 23 12:31:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 902920 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:400c:c0c::239; helo=mail-wr0-x239.google.com; envelope-from=swupdate+bncbdd6bwv65qpbb5ve67lakgqeravij3a@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="IRi8QcE4"; dkim-atps=neutral Received: from mail-wr0-x239.google.com (mail-wr0-x239.google.com [IPv6:2a00:1450:400c:c0c::239]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40V5TP3XSBz9rx7 for ; Mon, 23 Apr 2018 22:32:57 +1000 (AEST) Received: by mail-wr0-x239.google.com with SMTP id v11-v6sf18776054wri.13 for ; Mon, 23 Apr 2018 05:32:57 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1524486774; cv=pass; d=google.com; s=arc-20160816; b=zx31mdxZ7VpWvrsiv1DI76GITRSgKmh3G5am6wL9k5a0BTKJEc9QUFE6QeVzDdh1Zr synie6UgRQ6XFLOdmGN9StDWN2EOIkheiqn3rmjVSDL8LYeyHsKaYdxZqa5HciBkppvq KXE0aog0d3rGPA5Py4yf1eD4iYdUqZoJWDCh61RXHyZauIA0dC4argO5sSnyq+JPo1JY DHRg0k6mYKtEI2at9eXgpczcn5D/3yMitkQeSkS2z5wcwwzhXEmwYskXJuJRuIvXEnSD zpw6vEuDRJ9Dnf0zS3d9oQpECjLVsAAcKupqXtRJQ0iYoGpHTz0r9M8I/Mm5vlqIYnLU eB1A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:arc-authentication-results :arc-message-signature:mime-version:sender:dkim-signature :arc-authentication-results; bh=Muy5yJiNjZrt1tcGegrczpkPfY0QnqXuYm5yUL6g8nE=; b=ghugK/qh3G3dSAPaIyBYLqRi75aODSuAc/2gjDATPMZJa0WaVZ46I2TXwsTq2m3OTy hzguekLatdhGzH/1n50s7XWB3QeKsuz/rY6JGq1lmlWgknvaNfVoDvpEyvr1P/QkDhm6 EYw+EIe81jNhJEQ5NblPrhrKguV20nU8fRBLrlnk5kfBFEZrR+tTU8zxi2vPP115mW6x A3R863oRYKK7WwhbMNX2i9OEEnwHhgDrLp7h4k5CGBi8bbUO9h5/+sODKIv7sovUbj65 dZgHiC1mHp/6n8hmuNa/zfvz/cgUOm/h0gHa4O2Hc5B2Bvodg65a/scSwWVHHmmfkXwv vrsA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Muy5yJiNjZrt1tcGegrczpkPfY0QnqXuYm5yUL6g8nE=; b=IRi8QcE4THELyaKUn7m/cVk9U5NduXgVR8GAVicPKJmJpg7gr8LXuFxpIW8TMdmGDb Nb4rFrczlLUMCQ6vXUwkLhOVjq2kmlXDrebQ4kZFAsqNm8mMfZMNsRt0tRktyt+QMce0 bYwu55SXgIv8qBe68/KVfEpcxgEo+gesBj1M8tkpIru2WroVoTuRdgMjzOvdUI/jVf16 sj211PF2ZnB8fG7iu4Ly5p+YH9eXWOvjByBKvGqJq3RJ7w5IFyBzbrNVLruZY6qIFBXH epFqpODLOABLNf6L4IjkrP7CrRUpyWFUSIVUQS+JUmK/kBPD/B1FUf3zEHhDs/PXudSj Tvxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Muy5yJiNjZrt1tcGegrczpkPfY0QnqXuYm5yUL6g8nE=; b=IXchAXaGBDXxvRCJnl6N0KrJ7oGf+9XKok7doYsqh99V08epKMeNHfBBsqGxV/nnKd OHQy7ZizrcMebAYJbPYzv88dJtuKnPrNtKNFjaqjbOqwrJQ96C0alJWaoE7UXy0yjSI7 ESnVxNjum/8rACF2aftQdFVS0q8rjNP9QxoQO3x/M7Lj+gVusWAAfOBS5ntv2V6nxOIy hZsxex/Hytf6+f5oJEb5cb657mCyMFBoAxSuLKeYS8lXPJ1+RCT/ePqWU3ibYmbak9aG 4eeRzn5uvfkD6V9DicnDYO6XM+gSI8NBAiSo51MpgzuLvhgcJAIFIYvBRx0SJ3c9vrMh p5bg== Sender: swupdate@googlegroups.com X-Gm-Message-State: ALQs6tBplCHadSeI7neHuUGcxUC5QJHycu2R481edpb1H5/75mARFMsl 1+X9+SLZLTvCmpgg0ygwPk0= X-Google-Smtp-Source: AB8JxZqB3esOZCR5NTOuzwxeuDxMLwqoCV/g8UwWGWZ33mPebkoZljVQa0/sCPny6yP9QUIVlXrmBA== X-Received: by 10.28.23.9 with SMTP id 9mr138638wmx.6.1524486774913; Mon, 23 Apr 2018 05:32:54 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 10.80.186.135 with SMTP id x7ls247247ede.6.gmail; Mon, 23 Apr 2018 05:32:54 -0700 (PDT) X-Received: by 10.80.135.236 with SMTP id 41mr6030930edz.5.1524486774142; Mon, 23 Apr 2018 05:32:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524486774; cv=none; d=google.com; s=arc-20160816; b=KifIZxxa8y8oIeBraBbnjqC+BKVHOkIUHFhkqWwXGIcLeEhYr6NBtmDmxztXqcBVJu tyQPdrEtV/Jcz1XIV8vv4NHuV7hwRFhz/D9lMgrc+Ai8gz0rRx5LxEtonk3DnwPZQ3fe f/Fx/2X03hoJSiLx2+h0DnuA7erWn2V8QOwK4/A2EObkdupvC0ctq0NDLq4f3VsDRJ7h Slzziv5f7XaT6VEDDqyvhv9tXboz1uMy4oamMaMFC17aJ7kOXaRCV+DFn7JBIKibScWv TDlUZDd/gLwt43OZin2FMqdi23YMfdjNGsswxf7QyUw98jtKtp8Gc7xE83tCX01ZAkC3 k8ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=tYZYIp/+gOgrV9ucvGv51FivdwzhZvagnVLzHV+4xrk=; b=j73gUvcWaAbS2F2PW6nR9Zzs7BLvxlr/hHT7K5lip6BCH5SAOv1Ra79vh8Tm5Wp4eO Z4sog3Q4ScfmlBN/9eKjZaoCK3MRiyfJyq2OWiGgF3DWcAt09ym2EyDLRCHT5l0oXhhf rGH821taWhgiP7cRFmwcd1GwE5vciS/VI6q/2C+7MkT745ZdPZgcTMIrCvGj9UGe6vBb 3tcYWoWd/Sp6NseNel7HU1pBkm7iY6GRVkyDX8AeTwnmdzNnIGe6BQw6K+iLpzyFS9rp fr5D7CxidnB7XyVhGD9U/pL/NXgoWH0uAs0fySltkXtbo6RA4oXC2Ps7W3CNlGCEtkyN KiZg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id 4si394090edx.3.2018.04.23.05.32.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 05:32:54 -0700 (PDT) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w3NCWrp4002087 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 23 Apr 2018 14:32:53 +0200 Received: from MD1KR9XC.ww002.siemens.net ([139.25.69.174]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w3NCWX87018649; Mon, 23 Apr 2018 14:32:53 +0200 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm Subject: [swupdate] [PATCH 7/8] handler: add FreeBSD-compatible copy_write() callback Date: Mon, 23 Apr 2018 14:31:08 +0200 Message-Id: <20180423123109.18590-7-christian.storm@siemens.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180423123109.18590-1-christian.storm@siemens.com> References: <20180423123109.18590-1-christian.storm@siemens.com> X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , As FreeBSD likes to have writes to device nodes being multiples of 512 bytes, provide an according padding callback function as default for the raw handler. Signed-off-by: Christian Storm Reviewed-by: Stefano Babic --- handlers/raw_handler.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/handlers/raw_handler.c b/handlers/raw_handler.c index ac8e47a..e57367e 100644 --- a/handlers/raw_handler.c +++ b/handlers/raw_handler.c @@ -19,6 +19,31 @@ void raw_handler(void); void raw_filecopy_handler(void); +#if defined(__FreeBSD__) +/* + * FreeBSD likes to have multiples of 512 bytes written + * to a device node, hence slice the buffer in palatable + * chunks assuming that only the last written buffer's + * length is smaller than cpio_utils.c's BUFF_SIZE and + * doesn't satisfy length % 512 == 0. + */ +static int copy_write_padded(void *out, const void *buf, unsigned int len) +{ + if (len % 512 == 0) { + return copy_write(out, buf, len); + } + + uint8_t buffer[512] = { 0 }; + int chunklen = len - (len % 512); + int res = copy_write(out, buf, chunklen); + if (res != 0) { + return res; + } + memcpy(&buffer, buf+chunklen, len-chunklen); + return copy_write(out, buffer, 512); +} +#endif + static int install_raw_image(struct img_type *img, void __attribute__ ((__unused__)) *data) { @@ -31,8 +56,11 @@ static int install_raw_image(struct img_type *img, img->device, strerror(errno)); return -1; } - +#if defined(__FreeBSD__) + ret = copyimage(&fdout, img, copy_write_padded); +#else ret = copyimage(&fdout, img, NULL); +#endif close(fdout); return ret; From patchwork Mon Apr 23 12:31:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 902921 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:400c:c0c::23a; helo=mail-wr0-x23a.google.com; envelope-from=swupdate+bncbdd6bwv65qpbb55e67lakgqedfs7cca@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="nQCN4Awl"; dkim-atps=neutral Received: from mail-wr0-x23a.google.com (mail-wr0-x23a.google.com [IPv6:2a00:1450:400c:c0c::23a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40V5TQ3TSsz9ry1 for ; Mon, 23 Apr 2018 22:32:58 +1000 (AEST) Received: by mail-wr0-x23a.google.com with SMTP id v11-v6sf18776091wri.13 for ; Mon, 23 Apr 2018 05:32:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1524486775; cv=pass; d=google.com; s=arc-20160816; b=wAAuvYzsRfXrfmrYYRDLOsrWTV0cVO2h5tDOHWOpH73EUnOmYXw1qG3hPKGHD/bmIK mkcTuT2j/tnTIQiozzb8scgLS6GRuVbPXJ1PDI2AYLewamtlK1yzDkkjTwv2sQwtZApJ f+/COTK8E1jXf6PFvr7tmItlVhgCs7zHz7pxSyuKQOidMuml6hEhETSpe2/YBBQoChgu Amr74PB84jWfB3aaQm9FjTu8V5RrorCxpp1JHEOz63qy/uLKgVOWOX2+vGbJOMlsI7Vs y925qFd7xkq6V4luMcMdgcZZLf2LAa3p0ECYTbshFrz/BWYSqiqSMpcKczfODwu+C1y4 KQfw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:arc-authentication-results :arc-message-signature:mime-version:sender:dkim-signature :arc-authentication-results; bh=3qC87d4b2AnWtOKTbs1VvmrTI0j9Z3qh7LhMZeS2aFY=; b=z8VURB9SpsODl13iaKwfb3b+m+tGq/RNt+Ca2txXq6GshNvGgDM2FHB5W5zSz7CyVU 0C3YfUcx4Osw+kKRd6hfJZ/krrQjE5trSbd828JpnR8jDtfLHBZeuIDtITRqtamdZhqZ CaG9LeFTFzKrsppzuxsirCMpkOEEJeo0n2lPmtlIDjbDytzmvfbUZnSAJ5FKE60RAtlz icZbNT0a2zTX0I8rd32gUd2X3w/KvSn+FMWXsqhJYu+Mtqu7umoiE89Z1wKDPYWOIg5H YjGjxE8K9hSecHW8+2Pkg5OPNcHNYFoDM2XkTgPpZmJkEO8qyj9b2MabLUVakvOw7sC8 wb/w== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=christian.storm@siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=3qC87d4b2AnWtOKTbs1VvmrTI0j9Z3qh7LhMZeS2aFY=; b=nQCN4AwlmuNAaMCDVAhAPpsxNHLcWviIJqTjsVgJgHoPPpw4lVVicmtbDhwWn+ImbQ 1Ks2FI4+Xc54JIEhs0xYtpnnRrPrRwSNTFJnTyO4pn3J9XE33i1Ko//iEyV8q1V15mkQ j0NTCLB9Sf23EHGDYQtBnuZYy/szojPEB7ay1ImqoNR4uZN63bq8o9mZrqpCJ1GsSFvG mTh98fRBvKkgGOmygrLGEf8bkxtLQIhuQL172SQu5cBg8baL7kj3Ii/WGmiAI5b2PfW9 Fose5rhxT8JkcABsOPe/B1fiAwqfr67arnRIJfTDz7wMkpvQXXuaNWEbaDn66Ii+wSga 8RzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=3qC87d4b2AnWtOKTbs1VvmrTI0j9Z3qh7LhMZeS2aFY=; b=Z82baDbvBLdol0P+J3gfmoXteECdaG2nN1lpZGA4e0TVeIaAY9FyywK/U0qSoJCZN7 7RX2fC+k13NlGdBoaRzJn0CZRLOHswoFiG8UTmveYZ3WS7+G2OTRqE1TWACoFBf9gvcv QMa1SNofcUxAafqQdgP0DkY9GMT/0iuBtGv/aFb2CEaFvygMbIvO1ONdbS2EoqwpqQhp FvIP8gwqvF9UpAzmfr7HlJoyyplLdcsQrFyp7kUSkGB98jLKzPYDo0SMmK6jo0A2KEeW Bt8Ir6SQbjrAXUWDZfAGkF/4VQzRSBOvVubUMM7zjZGPn5642RLGJDiVx039rzIhWi7m xtEA== Sender: swupdate@googlegroups.com X-Gm-Message-State: ALQs6tCRrcJ3rMbHNluJIDmfi2JbqMP8JAZxJCEdQ1k6yPuiBOEKVsHm hc9AOGUqruzJcn1O8Ic/Ubw= X-Google-Smtp-Source: AB8JxZqa+SMXn+jkZJp4xzqRhl8wVQhZzfW37P6qTy1L6qZcNMmdjex+33gzH8xaLVkoWSzpMPw8CQ== X-Received: by 10.28.63.138 with SMTP id m132mr138022wma.2.1524486775783; Mon, 23 Apr 2018 05:32:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 10.28.11.10 with SMTP id 10ls1903064wml.12.canary-gmail; Mon, 23 Apr 2018 05:32:55 -0700 (PDT) X-Received: by 10.28.126.193 with SMTP id z184mr1182653wmc.14.1524486775206; Mon, 23 Apr 2018 05:32:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524486775; cv=none; d=google.com; s=arc-20160816; b=oPVgpsZBxHIc8LLXbRoLUelo4GaTC0poqypxlemZhiMVzIlv2KORukmDpwxNVD7G0m BtNccbUCKyIbZ4pkoCiTIUChQOWOrJLA+66N2bCFtMzrrJY1jMJSjM5C2gYM41lsvFY8 J+0SLrfyfa38dQpFovpTo/95AoRZlZw9eTmkeZ2BUsTyzUvRfwCJD/t0lGxFHrZ9ghan kHecWAD/W7AHt4LW28SpBZVh/yySjTac6T8k0/PZt/qcHqs+zr0SO75jkAfhjMLUBRgH so8cmSmvtO+LLZOoL+llNmoBiX7J6dJGUpl3eyzNRh6Y9iN7uDTSoMZU3eIskIFR8y+D /JXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=YYsr7oZ4Plw93HNkTTPDihlfrq8lrtocd9uSuW2tMoY=; b=I6P32RfTnbgRm3agRBZb7K3tGJkp4ILokhmzZ6bD06nMs13gjjvt/Y7WZrXVmbG8xl KdJ4pdekynK+wZwGn/fIvM5S/2R3w/TpdvjxwyOFdFwDRq7xM5CjzOJXrdUDqWpKZjLd jfRwgL5NflsdlegoJtj2UGCuO0t1p3sXNom5ceg/oIViOBUOyDL+xSoKR8ZNfiNtMCdV kiSxyHg3BDsW0WVcafkdWk1y+BPtXcuuTajGuGcTp2PAF1ZTCQQVzSwQmqxZ42/NQGN/ ep1bXBsAtcHoxobaXbpitdYFj05yT1VaWjFLyYBjfd2NgjKpqdF6JQFrKzVmYVfxECCW QCzA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id p21si390462wmc.1.2018.04.23.05.32.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 05:32:55 -0700 (PDT) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w3NCWso3023415 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 23 Apr 2018 14:32:54 +0200 Received: from MD1KR9XC.ww002.siemens.net ([139.25.69.174]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w3NCWX88018649; Mon, 23 Apr 2018 14:32:54 +0200 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm Subject: [swupdate] [PATCH 8/8] notifier: add FreeBSD-compatible notifier sockets Date: Mon, 23 Apr 2018 14:31:09 +0200 Message-Id: <20180423123109.18590-8-christian.storm@siemens.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180423123109.18590-1-christian.storm@siemens.com> References: <20180423123109.18590-1-christian.storm@siemens.com> X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , As FreeBSD doesn't have abstract sockets like Linux has, use filesystem-backed sockets for FreeBSD. Signed-off-by: Christian Storm --- Kconfig | 8 ++++++++ core/notifier.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/Kconfig b/Kconfig index c7d1d5c..8381827 100644 --- a/Kconfig +++ b/Kconfig @@ -155,6 +155,14 @@ config SOCKET_REMOTE_HANDLER_DIRECTORY Directory where sockets to remote handler processes are expected to be found. +config SOCKET_NOTIFIER_DIRECTORY + string "SWUpdate notifier socket directory" + depends on !HAVE_LINUX + default "/tmp/" + help + Path to SWUpdate's Notifier sockets on FreeBSD as + Linux-like abstract sockets are not available. + endmenu config MTD diff --git a/core/notifier.c b/core/notifier.c index 1a79a95..e2d1407 100644 --- a/core/notifier.c +++ b/core/notifier.c @@ -203,6 +203,26 @@ static void process_notifier (RECOVERY_STATUS status, int event, int level, cons } +#if !defined(__linux__) +static char* socket_path = NULL; +static void unlink_socket(void) +{ + if (socket_path) { + unlink(socket_path); + free(socket_path); + } +} + +static void setup_socket_cleanup(struct sockaddr_un *addr) +{ + socket_path = strndupa(addr->sun_path, sizeof(addr->sun_path)); + if (atexit(unlink_socket) != 0) { + TRACE("Cannot setup socket cleanup on exit, %s won't be unlinked.", socket_path); + } + unlink(socket_path); +} +#endif + /* * Utility function to setup the internal IPC */ @@ -210,11 +230,20 @@ static void addr_init(struct sockaddr_un *addr, const char *path) { memset(addr, 0, sizeof(struct sockaddr_un)); addr->sun_family = AF_UNIX; +#if defined(__linux__) /* * Use Linux-specific abstract sockets for this internal interface */ strcpy(&addr->sun_path[1], path); addr->sun_path[0] = '\0'; +#else + /* + * Use filesystem-backed sockets although this interface is internal + */ + strncpy(addr->sun_path, CONFIG_SOCKET_NOTIFIER_DIRECTORY, sizeof(addr->sun_path)); + strncat(addr->sun_path, path, + sizeof(addr->sun_path)-strlen(CONFIG_SOCKET_NOTIFIER_DIRECTORY)); +#endif } /* @@ -236,6 +265,10 @@ static void *notifier_thread (void __attribute__ ((__unused__)) *data) exit(2); } +#if !defined(__linux__) + setup_socket_cleanup(¬ify_server); +#endif + if (bind(serverfd, (const struct sockaddr *) ¬ify_server, sizeof(struct sockaddr_un)) < 0) { fprintf(stderr, "Error binding notifier socket: %s, exiting.\n", strerror(errno)); @@ -288,6 +321,9 @@ void notify_init(void) char buf[60]; snprintf(buf, sizeof(buf), "Notify%d", pid); addr_init(¬ify_client, buf); +#if !defined(__linux__) + setup_socket_cleanup(¬ify_client); +#endif notifyfd = socket(AF_UNIX, SOCK_DGRAM, 0); if (notifyfd < 0) { printf("Error creating notifier socket for pid %d", pid);