From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0049737e26cd40ab1c87c9f6251113e2fb68caea
Date: Sat, 30 Oct 2021 14:58:45 +0000 [thread overview]
Message-ID: <4HhMr538bvz2xlq@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 6248 bytes --]
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 0049737e26cd40ab1c87c9f6251113e2fb68caea (commit)
via 2d78849475f1c3ce33e10ae0890fe9187907b960 (commit)
via 71b06657f986715b23b7a5cfbdf1553d85a33eb7 (commit)
from 8ca80092c2bc11d436e9c686fb5eb22cde682837 (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 0049737e26cd40ab1c87c9f6251113e2fb68caea
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Oct 30 14:54:53 2021 +0000
core161: remove dropped client175 addon
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2d78849475f1c3ce33e10ae0890fe9187907b960
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Oct 29 19:11:34 2021 +0200
avahi: Install backup definition - bug#12714
- Addition of backup definition install into lfs file
- Update of rootfile
Fixes: 12714
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 71b06657f986715b23b7a5cfbdf1553d85a33eb7
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sat Oct 23 13:54:51 2021 +0200
backup definitions: housekeeping to remove orphaned definitions
- check_mk_agent, client175 & lcr are addons that have been removed so the backup
definitions are no longer required.
- dma is not a package but a core program and has its config backup requirements
built into the core backup include file so the addon backup definition is not
used or needed.
- No issues found in the build after these files were removed.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/includes/check_mk_agent | 1 -
config/backup/includes/client175 | 2 --
config/backup/includes/dma | 5 -----
config/backup/includes/lcr | 6 ------
config/rootfiles/core/161/update.sh | 13 +++++++++++++
config/rootfiles/packages/avahi | 1 +
lfs/avahi | 8 ++++++--
7 files changed, 20 insertions(+), 16 deletions(-)
delete mode 100644 config/backup/includes/check_mk_agent
delete mode 100644 config/backup/includes/client175
delete mode 100644 config/backup/includes/dma
delete mode 100644 config/backup/includes/lcr
Difference in files:
diff --git a/config/backup/includes/check_mk_agent b/config/backup/includes/check_mk_agent
deleted file mode 100644
index ca710461b..000000000
--- a/config/backup/includes/check_mk_agent
+++ /dev/null
@@ -1 +0,0 @@
-/etc/check_mk/
diff --git a/config/backup/includes/client175 b/config/backup/includes/client175
deleted file mode 100644
index 6cde8e8ca..000000000
--- a/config/backup/includes/client175
+++ /dev/null
@@ -1,2 +0,0 @@
-/src/client175/site.conf
-/var/ipfire/mpfire/*.m3u
diff --git a/config/backup/includes/dma b/config/backup/includes/dma
deleted file mode 100644
index 7c7520551..000000000
--- a/config/backup/includes/dma
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/ipfire/dma
-/var/ipfire/dma/dma.conf
-/var/ipfire/dma/auth.conf
-/var/ipfire/dma/mail.conf
-/var/spool/dma
diff --git a/config/backup/includes/lcr b/config/backup/includes/lcr
deleted file mode 100644
index 618f4c784..000000000
--- a/config/backup/includes/lcr
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/ipfire/lcr/extensions
-/var/ipfire/lcr/directory.list
-/var/ipfire/lcr/interface.conf
-/var/ipfire/lcr/options.conf
-/var/ipfire/lcr/routing.conf
-/var/log/lcr
diff --git a/config/rootfiles/core/161/update.sh b/config/rootfiles/core/161/update.sh
index 7017f2613..56d012b3a 100644
--- a/config/rootfiles/core/161/update.sh
+++ b/config/rootfiles/core/161/update.sh
@@ -87,6 +87,19 @@ rm -rf /lib/modules
rm -rf /boot/kernel*
rm -rf /usr/share/u-boot/rpi*
+# Remove dropped packages
+for package in client175; do
+ if [ -e "/opt/pakfire/db/installed/meta-${package}" ]; then
+ stop_service "${package}"
+ for i in $(</opt/pakfire/db/rootfiles/${package}); do
+ rm -rfv "/${i}"
+ done
+ fi
+ rm -f "/opt/pakfire/db/installed/meta-${package}"
+ rm -f "/opt/pakfire/db/meta/meta-${package}"
+ rm -f "/opt/pakfire/db/rootfiles/${package}"
+done
+
# Remove files
rm -rf /usr/bin/python
rm -rf /usr/bin/python2
diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi
index e6ab0c0ff..0a88be7f0 100644
--- a/config/rootfiles/packages/avahi
+++ b/config/rootfiles/packages/avahi
@@ -175,3 +175,4 @@ usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
#usr/share/man/man8/avahi-daemon.8
#usr/share/man/man8/avahi-dnsconfd.8
#usr/share/man/man8/avahi-dnsconfd.action.8
+var/ipfire/backup/addons/includes/avahi
diff --git a/lfs/avahi b/lfs/avahi
index ae166a88c..795ba4130 100644
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = avahi
-PAK_VER = 8
+PAK_VER = 9
DEPS = dbus libdaemon
@@ -102,6 +102,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Install initscript
$(call INSTALL_INITSCRIPT,avahi)
-
+
+ #install backup definition
+ install -v -m 644 ${DIR_SRC}/config/backup/includes/avahi \
+ /var/ipfire/backup/addons/includes/avahi
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2021-10-30 14:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4HhMr538bvz2xlq@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox