From patchwork Sun Apr 2 16:50:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 6761 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4PqKlb20flz3wgs for ; Sun, 2 Apr 2023 16:50:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4PqKlZ0Pf5zPW; Sun, 2 Apr 2023 16:50:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4PqKlY5rHDz2x9j; Sun, 2 Apr 2023 16:50:33 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4PqKlX6wJ6z2xPs for ; Sun, 2 Apr 2023 16:50:32 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4PqKlV4JLxzKY; Sun, 2 Apr 2023 16:50:30 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1680454230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=gcMaJW8hOdBIlRNZXgsBiizqxcSugA0XgnnfXh3kVa0=; b=9GmLkQNQYq/AdXX5swAqs9631xkWjZUW9K6x3h6LMivZhPPMr2MG6sKHVZLwkXDVjRo9Gi J3Ipjj3x92PtmICw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1680454230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=gcMaJW8hOdBIlRNZXgsBiizqxcSugA0XgnnfXh3kVa0=; b=BlsCuCqTPmMyCcrNpnHchSUmqnyvySQbEnPxB5zLveo4IbDjVEOY2GeH99F2V2w3rvJIKE RFSICFvXNgMC8o3xPIx6qq4gwaXoyYHpnR8hKBA8QiCQngOYIeoFrpv2TABR2yJRtPA7G1 nB3Pr7C5Nl0W+7wnAkrRBIYhcEQcMK06Ro6XWQC0iUAa2u3z1cPZwcaS2nItssZ1CauEoc j0Q7dFFQXMKRKZEKKc/wE56/lp4hBS/TX8XklKyWwj/WHb2GG66x3dClqBo9ZtHw9ksbvI rLUDwARhOj/HuvaAp1A3Paofw1rxZslrT5neL5PGP7g7dfpfQs9nGdMnFL4DMg== From: Stefan Schantl To: pakfire@lists.ipfire.org Subject: [PATCH] systemd.macro: Avoid declaring the directory for tmpfiles twice Date: Sun, 2 Apr 2023 18:50:23 +0200 Message-Id: <20230402165023.3286-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 X-BeenThere: pakfire@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Mailinglist for the Pakfire Build System." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pakfire-bounces@lists.ipfire.org Sender: "Pakfire" We allready have declared this directory in the arch macro file, so there is no need in doing this again. Signed-off-by: Stefan Schantl --- macros/systemd.macro | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/macros/systemd.macro b/macros/systemd.macro index 9dc74ff0..085fabbd 100644 --- a/macros/systemd.macro +++ b/macros/systemd.macro @@ -1,6 +1,3 @@ - -SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d - MACRO_INSTALL_SYSTEMD_FILES for file in %{DIR_SOURCE}/systemd/*; do [ -e "${file}" ] || continue @@ -14,8 +11,8 @@ end MACRO_INSTALL_SYSTEMD_TMPFILES for file in %{DIR_SOURCE}/*.tmpfiles; do [ -e "${file}" ] || continue - mkdir -p %{BUILDROOT}/%{SYSTEMD_TMPFILES_DIR} - cp -vf ${file} %{BUILDROOT}/%{SYSTEMD_TMPFILES_DIR}/$(basename ${file%*.tmpfiles}).conf + mkdir -p %{BUILDROOT}/%{tmpfilesdir} + cp -vf ${file} %{BUILDROOT}/%{tmpfilesdir}/$(basename ${file%*.tmpfiles}).conf done unset file end