From patchwork Wed Oct 23 07:11:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1181866 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::137; helo=mail-lf1-x137.google.com; envelope-from=swupdate+bncbaabbqp2x7wqkgqet2mcfmq@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="CwrnhW12"; dkim-atps=neutral Received: from mail-lf1-x137.google.com (mail-lf1-x137.google.com [IPv6:2a00:1450:4864:20::137]) (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 46yhQD3lBRz9sNx for ; Wed, 23 Oct 2019 18:12:04 +1100 (AEDT) Received: by mail-lf1-x137.google.com with SMTP id o2sf2717937lfb.12 for ; Wed, 23 Oct 2019 00:12:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571814721; cv=pass; d=google.com; s=arc-20160816; b=RCiHRy59Bubu0JCAO+EmR0BNPnFaOjLzNIOCgo+hxUIhr9OfDvlQjlbFhOgQbohKU1 tc0sVHQKElW7zJA/XKca3Nhr9KAU4c1wOPc//GW03Pf8CZysmCPtg4eai6MolqKDZDgC YZOGoXaMoETmxfe/BmLEkxsjoOLTEodBLWF1szWtYwZKc2p2F+R1IysfK3Mb28jXcpfo jlrrWwilK8F6mpLnuT0KE1jXhcvHjmtACRIn7FLcuCwu8aktV9aCZ0m1HKXz4PllP/Yb ipQq5noc7ZalivUbFgH8P5RCNPC7aaZS+rYyCMOVeFEwVkLVu80T1lknebENMSs3qhTS tGpg== 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=fV7vVlXjRfvSpLQvowVtP4wdniU3LPtnFlZjCTk1M7E=; b=HGhs3fq2nhOV7mUXYJJxG3rM97ZKzK5HT8l0Jz+o7m8EMDwJDc6mI0RZT/kR5xLs89 1j6YGVlm1njR94XMUfo3518HO5U5unmnd/ATHpUv2DlKjMPjjsIcXrDhIaDd2XAE+TQY wquPLTT2bLx2dQYmLiUn2jgtLU8OBU1aaKvGqlCxh6yZAqT41Db329MWiiX0to5ZABho CjSMgGPF/+EwWXJhyq06UCWlDON3LN/9hH1A6HoIREZo4oJ2xeDpINtRsSw2tWyr11XE bMr97djhUeX96vuQHcLzNdYAHQ5SK+KHwVb0UYp2HxfZIummVoUebfBXZGGzWha08IF0 snJQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 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=fV7vVlXjRfvSpLQvowVtP4wdniU3LPtnFlZjCTk1M7E=; b=CwrnhW12g+MkAnfAQt53tZPyyQjJGUDSPNjpSGeNi+5UrWojf4LLnaO2kfEBjoViAT KM5lcnPjBRSZ+Izck1XO5HIGHpS412bARUv+tONc4VW8lEat6VRacPEbg7GLG/+mMUkW kGgyvVhxpJdKNso0F4zGotwXTJ14dZ7nn+Tp2wpb9anPytR0N0Mfw5CmZ9rnXYqHniYm sbthTz184atkuKyhn4/TtzhTIeFLOQYGzG/ksvnTKC+Zr7j44QMB8tT+ySxU1a/xg7l2 iVch10fubJTiOvpxA/0WBc5juRarXNnwcu+kAIEGSYM5FRTKpULu0CYWwNZ6dmZxBEK1 eJQA== 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=fV7vVlXjRfvSpLQvowVtP4wdniU3LPtnFlZjCTk1M7E=; b=Mjw8rhYA0SJrDBdF5yetAwIlRWD2UIuRmtDuohKjg1bC63HPhzlCLilBX+kyxivy7t eXLVVqh+uJXVK/MjaIilC3J0QuAqtrUTEvTFWkNOVSTN7wTic5Z8NSNuxb7vJEV4SUbc wc1R3w5ipAZXwjauClpinhlIHa82XlUCpad8MQAaPv0CNVfumBtrd3wWUUkRkBKRSP4a RqX8aURHrkLi77vJ1fY0FP2zxjhef299ZkpjAGedPeCNB/EFnfMVoAlnEyPAv172+t+h ldbyDhwA8VFi8w2HOSS6hl/WooiJMVk/MVLyaMCl/bEPC3mh46eb359VliAL2Qveq6AJ tx0g== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAX7/xBK5AcA6Xz79tFLgN0ggC7Rz0htZd0kjO07zE3bCVMLTnju vgOxUHK/04GAmQ9LE/3nL+Q= X-Google-Smtp-Source: APXvYqwfBBF1A5djvOcUmZQA0jdh6Qqjd+tNgnZV69WTAbdbBhfKGERayGFOZaO7P5YShqsWaEpxAA== X-Received: by 2002:a19:fc1e:: with SMTP id a30mr8337615lfi.167.1571814721207; Wed, 23 Oct 2019 00:12:01 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a19:93:: with SMTP id 141ls100015lfa.12.gmail; Wed, 23 Oct 2019 00:12:00 -0700 (PDT) X-Received: by 2002:a19:8092:: with SMTP id b140mr16753304lfd.13.1571814720776; Wed, 23 Oct 2019 00:12:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571814720; cv=none; d=google.com; s=arc-20160816; b=vtxgZcv2lFnzE2DJk7/PvRfJSALaD3X5hv1h6RLwwkqEtqacqfbY9RqAKt8rQM+2+r r38U0GEwn38MjWOTNAMnvf504RMSNPkfrDTNqVbo+cBKYZI+9W7ouAiGQhnLrYK8Uf7J fwgbTKlRgCJeF6MNrU5QWcdMGXdmKFqEmxZBhzVRGKEliJO4JBS7K8BiZVb8MkPboUH2 ZXj+cXvB4zToUj6N7JXnAyJBWq+6gIYQgbDi7slNqJZhSVVr0QIY19UKUPo5HgBo/mHo Qeaq+IxJcCNFn3zIrlyhyZ/i8Widylb6Pm9ZtBOQVmx12XEtl/8s8E0e/U+CGeK5embX rXhw== 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=Bcq0V5vIhKuSU67MHgFFUqGHWSJI1+4yCxOIo/F82/o4EpwVywQzLC5pqwLFhd+cEK jH3mfLbLy0D7qBs1JD71ETPJHYh+mfcbMRvSYT9TWdTbWQ1JKOHK2GTQQXWtvN1DUEkG UPZAkSTKrR0/aySqvTlPDcA7RKR+h+71vLxkfxamyRuu1iG49AJ2SZKa+FsWRrv/Qq/p 7OqxWkAH1EKsOuhewc532KkWyd6ERYVisHUzVi5CjqL5dUuusP+19ZPXL2UEkbZ9x1H7 TqPVgsc46DcX+GNvhSAfdlEs0Fi16Z7hb6aBMIyoUjPpHSsEMt9EyPkynQ/tPeQx24TS cadw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id q25si1140905ljg.5.2019.10.23.00.12.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 00:12:00 -0700 (PDT) Received-SPF: pass (google.com: domain of adrian.freihofer@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 x9N7C0WN017997 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 23 Oct 2019 09:12:00 +0200 Received: from dev.vm6.ccp.siemens.com (md1w1dqc.ad001.siemens.net [139.16.125.119]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id x9N7BwGA002772; Wed, 23 Oct 2019 09:11:58 +0200 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id 6BE932353A50; Wed, 23 Oct 2019 09:11:58 +0200 (CEST) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [PATCH v4 3/3] Makefile: rename tools binaries Date: Wed, 23 Oct 2019 09:11:38 +0200 Message-Id: <20191023071138.26395-4-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191023071138.26395-1-adrian.freihofer@siemens.com> References: <20191023071138.26395-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.2 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