diff mbox series

[2/2] perl-TimeDate: Move from package into main system

Message ID 20230222122534.259972-2-michael.tremer@ipfire.org
State Accepted
Commit b7fdcbf6cabd0cb6fb3d53a1b74d7c6aa111b6ea
Headers
Series [1/2] OpenVPN: Show indication when OpenVPN certificates expire |

Commit Message

Michael Tremer Feb. 22, 2023, 12:25 p.m. UTC 
  This is now required by ovpnmain.cgi for certificate expiry time
detection.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 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%)

Comments

Peter Müller March 5, 2023, 2:41 p.m. UTC | #1 
Acked-by: Peter Müller <peter.mueller@ipfire.org>

> This is now required by ovpnmain.cgi for certificate expiry time
> detection.
> 
> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
> ---
>  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   =
>
diff mbox series

Patch

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   =