From patchwork Wed Feb 22 12:25:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 6604 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 4PMFjw37XKz3x1v for ; Wed, 22 Feb 2023 12:25:40 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4PMFjt72SWzvD; Wed, 22 Feb 2023 12:25:38 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4PMFjt5PXTz2xfN; Wed, 22 Feb 2023 12:25:38 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4PMFjs4WzHz2xLF for ; Wed, 22 Feb 2023 12:25:37 +0000 (UTC) Received: from michael.haj.ipfire.org (michael.haj.ipfire.org [172.28.1.242]) (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 "michael.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4PMFjs0LQdzkm; Wed, 22 Feb 2023 12:25:37 +0000 (UTC) Received: by michael.haj.ipfire.org (Postfix, from userid 0) id 4PMFjr5J8szTgZt; Wed, 22 Feb 2023 12:25:36 +0000 (UTC) From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/2] perl-TimeDate: Move from package into main system Date: Wed, 22 Feb 2023 12:25:34 +0000 Message-Id: <20230222122534.259972-2-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230222122534.259972-1-michael.tremer@ipfire.org> References: <20230222122534.259972-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is now required by ovpnmain.cgi for certificate expiry time detection. Signed-off-by: Michael Tremer Acked-by: Peter Müller --- config/rootfiles/{packages => common}/perl-TimeDate | 0 lfs/perl-TimeDate | 5 ----- lfs/swatch | 4 ++-- 3 files changed, 2 insertions(+), 7 deletions(-) rename config/rootfiles/{packages => common}/perl-TimeDate (100%) diff --git a/config/rootfiles/packages/perl-TimeDate b/config/rootfiles/common/perl-TimeDate similarity index 100% rename from config/rootfiles/packages/perl-TimeDate rename to config/rootfiles/common/perl-TimeDate diff --git a/lfs/perl-TimeDate b/lfs/perl-TimeDate index b56c5e7f6..ccb6f534a 100644 --- a/lfs/perl-TimeDate +++ b/lfs/perl-TimeDate @@ -33,11 +33,6 @@ DL_FILE = ${THISAPP}.tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = perl-TimeDate -DEPS = -PAK_VER = 7 - -SERVICES = ############################################################################### # Top-level Rules diff --git a/lfs/swatch b/lfs/swatch index 227313e07..1071e9b12 100644 --- a/lfs/swatch +++ b/lfs/swatch @@ -34,9 +34,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = swatch -PAK_VER = 6 +PAK_VER = 7 -DEPS = perl-File-Tail perl-Date-Calc perl-TimeDate perl-Date-Manip +DEPS = perl-File-Tail perl-Date-Calc perl-Date-Manip SERVICES =