From 2a2a0cf49903abc4a34029da986e23ea36f2e2d0 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Mon, 10 Aug 2015 16:25:35 +0200
Subject: [PATCH] sysmocom-backup: Create a single sysmocom-backup-default

We can not have sysmocom-backup-default and sysmocom-backup-data-default
installed at the same time. I don't want to play games with RREPLACE and
RPROVIDES either. So simply use one of the two files. Copy the two more
default values over to the other recipe.
---
 .../sysmocom-backup-data/files/default.files  | 22 -------------------
 .../sysmocom-backup-data_1.0.bb               |  8 -------
 .../sysmocom-backup/files/default.files       |  2 ++
 3 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 recipes-apps/sysmocom-backup-data/files/default.files

diff --git a/recipes-apps/sysmocom-backup-data/files/default.files b/recipes-apps/sysmocom-backup-data/files/default.files
deleted file mode 100644
index 8f24cb3..0000000
--- a/recipes-apps/sysmocom-backup-data/files/default.files
+++ /dev/null
@@ -1,22 +0,0 @@
-etc/hostname
-etc/ifplugd.sh
-etc/network/interfaces
-etc/openvpn
-etc/opkg/sysmocom-config.conf
-etc/osmocom/osmo-bsc-mgcp.cfg
-etc/osmocom/osmo-bsc.cfg
-etc/osmocom/osmo-bts.cfg
-etc/osmocom/osmo-nitb.cfg
-etc/osmocom/osmo-pcu.cfg
-etc/osmocom/osmo-sgsn.cfg
-etc/systemd/system/multi-user.target.wants/osmo-nitb.service
-etc/systemd/system/multi-user.target.wants/osmo-bsc.service
-etc/systemd/system/multi-user.target.wants/osmo-sgsn.service
-etc/ggsn.conf
-etc/default
-var/lib/osmocom/hlr.sqlite3
-etc/lcr
-etc/udhcpd.conf
-etc/sysmocom/backup.d
-etc/machine-id
-etc/dropbear/dropbear_rsa_host_key
diff --git a/recipes-apps/sysmocom-backup-data/sysmocom-backup-data_1.0.bb b/recipes-apps/sysmocom-backup-data/sysmocom-backup-data_1.0.bb
index f61006b..425c411 100644
--- a/recipes-apps/sysmocom-backup-data/sysmocom-backup-data_1.0.bb
+++ b/recipes-apps/sysmocom-backup-data/sysmocom-backup-data_1.0.bb
@@ -8,7 +8,6 @@ SRC_URI = " \
 	file://sysmocom-restore-data \
 	file://data.mount \
 	file://sysmocom-restore.service \
-	file://default.files \
 "
 RDEPENDS_${PN} = "tar"
 RCONFLICTS_${PN} = "symocom-backup"
@@ -20,18 +19,11 @@ do_install() {
 	install -m 0755 ${WORKDIR}/sysmocom-backup-data ${D}${sbindir}/
 	install -m 0755 ${WORKDIR}/sysmocom-restore-data ${D}${sbindir}/
 
-	install -d ${D}${sysconfdir}/sysmocom/backup.d
-	install -m 0644 ${WORKDIR}/default.files ${D}${sysconfdir}/sysmocom/backup.d/
-
 	install -d ${D}${systemd_unitdir}/system
 	install -m 0644 ${WORKDIR}/data.mount ${D}${systemd_unitdir}/system/
 	install -m 0644 ${WORKDIR}/sysmocom-restore.service ${D}${systemd_unitdir}/system/
 }
 
-PACKAGES =+ "${PN}-default"
-
-FILES_${PN}-default = "${sysconfdir}/sysmocom/backup.d/"
-
 SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE_${PN} = "data.mount sysmocom-restore.service"
 SYSTEMD_AUTO_ENABLE_${PN} = "enable"
diff --git a/recipes-apps/sysmocom-backup/files/default.files b/recipes-apps/sysmocom-backup/files/default.files
index fb4d363..8f24cb3 100644
--- a/recipes-apps/sysmocom-backup/files/default.files
+++ b/recipes-apps/sysmocom-backup/files/default.files
@@ -18,3 +18,5 @@ var/lib/osmocom/hlr.sqlite3
 etc/lcr
 etc/udhcpd.conf
 etc/sysmocom/backup.d
+etc/machine-id
+etc/dropbear/dropbear_rsa_host_key