From patchwork Mon Oct 21 15:47:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1180702 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::23c; helo=mail-lj1-x23c.google.com; envelope-from=swupdate+bncbaabbmfgw7wqkgqegamjfci@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (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="Osd6l2cz"; dkim-atps=neutral Received: from mail-lj1-x23c.google.com (mail-lj1-x23c.google.com [IPv6:2a00:1450:4864:20::23c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46xgyX3Lcrz9sPT for ; Tue, 22 Oct 2019 02:48:04 +1100 (AEDT) Received: by mail-lj1-x23c.google.com with SMTP id 5sf2490354lje.12 for ; Mon, 21 Oct 2019 08:48:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571672881; cv=pass; d=google.com; s=arc-20160816; b=Pt75+MatQEbfPYKO1nh2ggw/Tva+ZyI3oR5wGOFTjx8jjTovbCg6Hax5PbWNln+5Fn 4SmcBb8zw2acw9srgPgwzJl/WR8RlhLkuoNMBlSPXmFOZoFUox5oa8etuH50lNQh/jPl fECeu1FhjrJaMurTGzmwGh0Anc5OtjhGi5ZUXZzZaffQL/k24E1Y512x1mjwHzlXACmL Q2v0lU9uiwUldRriTsYdDVeg6CnZBkvmSLyFxbvC/qkNwqdviUiHA9WXSfQNnbTaeN42 Pyu9P82Lsha+uO5u7edjgiANE53LIuAY9uEQxvwdbAwF1nzGz3LTmEjTePhZUdCVYILu QLbQ== 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:mime-version:sender:dkim-signature; bh=DEXfUKtKIkJ6ZFqePz/KXsKs8v+H+v/YrpcsojBnedo=; b=CKQgDtpOjKnLIUzo7DtmrJvKM8QWZiKO3IuyxWFz6SBSCoaX21Iep8aFU1DFhdaQUL TO1CrLhVBIXdPf9szrYXUKTwgzTHQaW5pw0c53mfUhgcVsBLCgTFo+N3Hcly7EapG20i X+jtG/5XLIa3wpBiocXtxgibRZs3+E2wh7qYISgXIJo2xXHKSZwMrtbqSPyKD37y9gcm eihArQSNcuGHmN8v7LpXb9tvdjP8u4s0k9ZqpPMZSqVV7xk9NQhpZNxVMYAf3ah+QuKO CC/Vw5jHZlknmC67uDEMrywqvssubylZZdfu52nKa7uzb0XqX6VUZ+O0PpoK55NHvBi9 ZjyA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=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=DEXfUKtKIkJ6ZFqePz/KXsKs8v+H+v/YrpcsojBnedo=; b=Osd6l2cz4HST/pvCGtmrJJshEi/BDmbUzji2blnGlIELLpqevScvbQsLh6GW7+C4mr rfnQAtAiu28YWiHGJkflEpOBEB0mkADzLuTfGC0my55M0xJldkgAp2k9Ta1kMJuExobN iHS08yTXtqtt4PPWzGRk+CBVwE+RT3uCp+D/bEfKRIPR+RzqCIXNswToZvpKI4aM5Bow f4hL5BPBN7ymjerlflNcxF9u0/C0s8nUO9SdKOSRo6EsP2yKFN+53m1V8PEfva5f5WE2 LJCYEeRgK89ZzNrk5HFWviB6gLPrMrGUh8mMo8WVN1d8a7Nnyf1bJTneM7JWLQUWg9is Uj+A== 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=DEXfUKtKIkJ6ZFqePz/KXsKs8v+H+v/YrpcsojBnedo=; b=sDvqWhawgVN868j56hMkfB7+b9FZHP9PYWpFvfawCJn7O7U+44XKV8xpEgHPPY5jcH zwaKGwllSQKb30vDVowX6vgzuCi1Ey1GcoH4A+Rf43PG+J/aCKPzN80mSrfFrFborcK1 p2qQRSCtBXPiyhOpqU37ZvRHjAtCHtkaAT2YWHdAEzAJ0CqVCOneRJYMNoE18HjPw3wd m6vLm+753luPwChTLjqumWAZsetF1NRJzYaGYHfnbKEmd9Uc5EDe8KrxFW0VljAg9mWN 6pOSDvRVSAFpgFuo1xsEZpLEopIeOW0xuIupIJDlTxaWUuipfMk1nii286t+49Vd1io3 ARNw== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAX837JpeTphIG4sqFRclzxCiP7PJXHM55jpFR+DRtiPBGQZWLKf NukBsdF1JA9H+vmMpPHt7aA= X-Google-Smtp-Source: APXvYqxe9mZgLnLRg6uPgkJfFnjuabx/EVlnA7Fa6ObN/fnZ8mtvNbBorifjvbHU+ZT7f78BX2GaoA== X-Received: by 2002:a2e:a0d6:: with SMTP id f22mr15724381ljm.81.1571672880657; Mon, 21 Oct 2019 08:48:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:9d44:: with SMTP id y4ls1628461ljj.4.gmail; Mon, 21 Oct 2019 08:48:00 -0700 (PDT) X-Received: by 2002:a2e:85cf:: with SMTP id h15mr15609340ljj.109.1571672880015; Mon, 21 Oct 2019 08:48:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571672880; cv=none; d=google.com; s=arc-20160816; b=zbIVkOfCrht/0PktXD0VjHaHFGCxkJtDaMFDlLIbpNnCiLi9bfVJqHRGz9ro30VzfG MS/qEf1Y8m8xdkNAEVydyxmE59SmntFe0M2XEjATsU1EB5eR4YkL/gIJDVhoO647nxh6 vQsBfRa1k8BuZ3hNR/GRpbkJBSPvdp/C3qq+sBmMbvLifYsOH/4B4GO2gNHSUKTP8JlY xAour0aTNicQmfV56tIs7qkncaRJlsw4GT+8agEqM+xqUotc8Aeiir/CrsaHGeQwmpvD PxBOp7gdeH79DI6ZCGe4xTovyScFh5RqpjMejxr0atGxhBFH9TiSJF+VEH1ky94Annkz cVLQ== 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; bh=86Ku5Od1l+NSk0j32ainwBXvCLLYEKV5MY/k4kAwt/A=; b=BOxX75qixVWNUUJd5AFNHhiTZc7jPp9Xv5SOy4tPrqVWoWKPVggEES+t2FYMQ8GRpK h+ux/maRj6c7jc9hIin4omEnjz+DmeaULvUbcnhevSFnr8fijP2xNdG00lVIPfA6Y3/r 33ogFd78bhbuEzWjO4S35RmqvrWhb7rBUsfNSE2s5oXp9ZfIiMMMJ6RZSNeYvx32/ZWc AEYS+r1cjuu1DHnvMUviZuTHIUwnOCb7SqCwWNiHkxGjpKRVqiv/+NIZblxilJLEdSgc ZCfE/MfxIwqtzTcS13KKLD6lZD9rQ4tMuc3fBSWOWwWo5IawlRWOT8Vteyv8GaG8u4m3 /tnQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id z26si110356lfq.4.2019.10.21.08.47.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Oct 2019 08:48:00 -0700 (PDT) Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x9LFlxTR002823 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 21 Oct 2019 17:47:59 +0200 Received: from dev.vm6.ccp.siemens.com (md1w1dqc.ad001.siemens.net [139.16.117.54]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id x9LFlwYU005024; Mon, 21 Oct 2019 17:47:58 +0200 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id E5C142353A50; Mon, 21 Oct 2019 17:47:57 +0200 (CEST) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [PATCH v2 3/3] Makefile: rename tools binaries Date: Mon, 21 Oct 2019 17:47:39 +0200 Message-Id: <20191021154739.12228-3-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191021154739.12228-1-adrian.freihofer@siemens.com> References: <20191021154739.12228-1-adrian.freihofer@siemens.com> X-Original-Sender: adrian.freihofer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=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: , This adds a "swupdate-" prefix to all binary files in the tools directory. Binaries should not be installed as /usr/bin/client or /usr/bin/progress. On the one hand, it is risky for name conflicts. On the other hand, the name gives little indication of the meaning of the binary. This renaming is also required by Debian maintainers. Another reason for the renaming is that do_install in meta-swupdate is currently defective. The binaries are installed twice, once with and once without the swupdate prefix. If the binaries are already installed correctly named by "make install", the code that renames and duplicates the binaries can be deleted from meta-swupdate. This change also fixes an inconsistency in the "make install" target. The recently added service files call the binaries named swupdate-*. But these binaries have not yet been installed. The inconsistency was overlooked because meta-swupdate provides two copies of the binaries. The swupdate-sysrestart was missing in the .gitignore file. Signed-off-by: Adrian Freihofer --- .gitignore | 9 +++++---- tools/Makefile | 8 ++++---- tools/{client.c => swupdate-client.c} | 0 tools/{hawkbitcfg.c => swupdate-hawkbitcfg.c} | 0 tools/{progress.c => swupdate-progress.c} | 0 tools/{sendtohawkbit.c => swupdate-sendtohawkbit.c} | 0 6 files changed, 9 insertions(+), 8 deletions(-) rename tools/{client.c => swupdate-client.c} (100%) rename tools/{hawkbitcfg.c => swupdate-hawkbitcfg.c} (100%) rename tools/{progress.c => swupdate-progress.c} (100%) rename tools/{sendtohawkbit.c => swupdate-sendtohawkbit.c} (100%) diff --git a/.gitignore b/.gitignore index af9f5cc..652888b 100644 --- a/.gitignore +++ b/.gitignore @@ -35,10 +35,11 @@ swupdate swupdate_unstripped* lua_swupdate.so* tools/*_unstripped -tools/client -tools/progress -tools/sendtohawkbit -tools/hawkbitcfg +tools/swupdate-client +tools/swupdate-progress +tools/swupdate-sendtohawkbit +tools/swupdate-hawkbitcfg +tools/swupdate-sysrestart tools/*.map tools/*.out diff --git a/tools/Makefile b/tools/Makefile index ca0a4a3..206b0eb 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -9,10 +9,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later lib-y += \ - client.o \ - progress.o \ - hawkbitcfg.o \ - sendtohawkbit.o \ + swupdate-client.o \ + swupdate-progress.o \ + swupdate-hawkbitcfg.o \ + swupdate-sendtohawkbit.o \ swupdate-sysrestart.o # # Uncomment the next lines to integrate the compiling/linking of diff --git a/tools/client.c b/tools/swupdate-client.c similarity index 100% rename from tools/client.c rename to tools/swupdate-client.c diff --git a/tools/hawkbitcfg.c b/tools/swupdate-hawkbitcfg.c similarity index 100% rename from tools/hawkbitcfg.c rename to tools/swupdate-hawkbitcfg.c diff --git a/tools/progress.c b/tools/swupdate-progress.c similarity index 100% rename from tools/progress.c rename to tools/swupdate-progress.c diff --git a/tools/sendtohawkbit.c b/tools/swupdate-sendtohawkbit.c similarity index 100% rename from tools/sendtohawkbit.c rename to tools/swupdate-sendtohawkbit.c