perl-TimeDate: Move from package into main system

This is now required by ovpnmain.cgi for certificate expiry time
detection.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Acked-by: Peter Müller <peter.mueller@ipfire.org>

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 b56c5e7f6a64d3c800de0a85465e4ed3dcdeb853..ccb6f534abfdd694fc9f30ab6123fc55049e1107 100644 (file)
--- 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 227313e07379438f2a0b064473fd45f1c838a28e..1071e9b12f4ae0f6997d07a0a657f3f3fb0a99f8 100644 (file)
--- 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   =