move perl-DBI and perl-DBD-SQLite to core system

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/packages/perl-DBD-SQLite b/config/rootfiles/common/perl-DBD-SQLite
similarity index 100%
rename from config/rootfiles/packages/perl-DBD-SQLite
rename to config/rootfiles/common/perl-DBD-SQLite

diff --git a/config/rootfiles/packages/perl-DBI b/config/rootfiles/common/perl-DBI
similarity index 100%
rename from config/rootfiles/packages/perl-DBI
rename to config/rootfiles/common/perl-DBI

diff --git a/config/rootfiles/core/145/filelists/perl-DBD-SQLite b/config/rootfiles/core/145/filelists/perl-DBD-SQLite
new file mode 120000 (symlink)
index 0000000..d911249
--- /dev/null
+++ b/config/rootfiles/core/145/filelists/perl-DBD-SQLite
@@ -0,0 +1 @@
+../../../common/perl-DBD-SQLite
\ No newline at end of file

diff --git a/config/rootfiles/core/145/filelists/perl-DBI b/config/rootfiles/core/145/filelists/perl-DBI
new file mode 120000 (symlink)
index 0000000..8b26e71
--- /dev/null
+++ b/config/rootfiles/core/145/filelists/perl-DBI
@@ -0,0 +1 @@
+../../../common/perl-DBI
\ No newline at end of file

diff --git a/config/rootfiles/core/145/update.sh b/config/rootfiles/core/145/update.sh
index 45177e1587b64e5338866ea00d2c32c84b921e3c..5f5394f789032102b53981a7c0621a4aecab3595 100644 (file)
--- a/config/rootfiles/core/145/update.sh
+++ b/config/rootfiles/core/145/update.sh
@@ -66,6 +66,13 @@ rm /etc/rc.d/rc6.d/K45random
 mv /etc/rc.d/rc3.d/S00random /etc/rc.d/rcsysinit.d/S66random
 mv /etc/rc.d/rcsysinit.d/S92rngd /etc/rc.d/rcsysinit.d/S65rngd
 
+# remove packages that are included now in core
+for package in perl-DBI perl-DBD-SQLite; do
+        rm -f /opt/pakfire/db/installed/meta-$package
+        rm -f /opt/pakfire/db/meta/meta-$package
+        rm -f /opt/pakfire/db/rootfiles/$package
+done
+
 # Start services
 /etc/init.d/vnstat start
 /etc/init.d/unbound restart

diff --git a/lfs/perl-DBD-SQLite b/lfs/perl-DBD-SQLite
index 37d09ecf9a5461d2af0eb13c75e240c13af5857b..83b51c9f53247f322c2bf0bdf2630ac701ec76ed 100644 (file)
--- a/lfs/perl-DBD-SQLite
+++ b/lfs/perl-DBD-SQLite
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,7 +32,6 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = perl-DBD-SQLite
-PAK_VER    = 2
 
 DEPS       = perl-DBI
 
@@ -54,9 +53,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist:
-       @$(PAK)
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################

diff --git a/lfs/perl-DBI b/lfs/perl-DBI
index b19fbdc321d3486673ce6b7677397c3108477dce..b7435905a571125e765d875dcb749b267dfa7b0c 100644 (file)
--- a/lfs/perl-DBI
+++ b/lfs/perl-DBI
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,7 +32,6 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = perl-DBI
-PAK_VER    = 3
 
 ###############################################################################
 # Top-level Rules
@@ -52,9 +51,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
-       @$(PAK)
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################