[prev in list] [next in list] [prev in thread] [next in thread]
List: ipfire-scm
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 76a1dedb4fbd40b4eb1d7f8267879de4
From: Arne Fitzenreiter <git () ipfire ! org>
Date: 2020-05-20 9:48:19
Message-ID: 49Rnxb3TKXz2xdB () people01 ! haj ! ipfire ! org
[Download RAW message or body]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 76a1dedb4fbd40b4eb1d7f8267879de4854b3e9d (commit)
from b2896abb64c88264656cc67d282421b6ee997896 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 76a1dedb4fbd40b4eb1d7f8267879de4854b3e9d
Author: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed May 20 09:47:25 2020 +0000
move perl-DBI and perl-DBD-SQLite to core system
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/{packages => common}/perl-DBD-SQLite | 0
config/rootfiles/{packages => common}/perl-DBI | 0
config/rootfiles/core/145/filelists/perl-DBD-SQLite | 1 +
config/rootfiles/core/145/filelists/perl-DBI | 1 +
config/rootfiles/core/145/update.sh | 7 +++++++
lfs/perl-DBD-SQLite | 6 +-----
lfs/perl-DBI | 6 +-----
7 files changed, 11 insertions(+), 10 deletions(-)
rename config/rootfiles/{packages => common}/perl-DBD-SQLite (100%)
rename config/rootfiles/{packages => common}/perl-DBI (100%)
create mode 120000 config/rootfiles/core/145/filelists/perl-DBD-SQLite
create mode 120000 config/rootfiles/core/145/filelists/perl-DBI
Difference in files:
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
index 000000000..d911249f8
--- /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
index 000000000..8b26e71bb
--- /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 45177e158..5f5394f78 100644
--- 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 37d09ecf9..83b51c9f5 100644
--- 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 b19fbdc32..b7435905a 100644
--- 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
###############################################################################
hooks/post-receive
--
IPFire 2.x development tree
_______________________________________________
IPFire-SCM mailing list
IPFire-SCM@lists.ipfire.org
https://lists.ipfire.org/mailman/listinfo/ipfire-scm
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic