From 705488de0c0a62a451f8472b8274dd3fa0e4b23b Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Tue, 15 Mar 2022 16:19:54 +0100 Subject: [PATCH] Move sysmocom-openvpn-config task-sysmocom-tools -> feed Package sysmocom-openvpn-config was recently added to task-sysmocom-tools. That task is pulled in by default into images. We don't actually want that. Instead, we want the package to be available in feeds, but without being installed into the image by default. Hence, revert the recent commit and put the package in task-sysmocom-feed.bb instead. Fixes: d8cb7e21d05c58913b961944b0702daac33c9a2f Related: SYS#5734 --- recipes-apps/tasks/task-sysmocom-feed.bb | 3 ++- recipes-apps/tasks/task-sysmocom-tools.bb | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-apps/tasks/task-sysmocom-feed.bb b/recipes-apps/tasks/task-sysmocom-feed.bb index 5c70439..410f82c 100644 --- a/recipes-apps/tasks/task-sysmocom-feed.bb +++ b/recipes-apps/tasks/task-sysmocom-feed.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = " \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" ALLOW_EMPTY_${PN} = "1" -PR = "r24" +PR = "r25" RDEPENDS_${PN} = "\ task-sysmocom-tools \ @@ -11,6 +11,7 @@ RDEPENDS_${PN} = "\ task-sysmocom-legacy \ task-gprscore \ packagegroup-sysmobts-sob \ + sysmocom-openvpn-config \ minicom \ vlan \ patch \ diff --git a/recipes-apps/tasks/task-sysmocom-tools.bb b/recipes-apps/tasks/task-sysmocom-tools.bb index 84693dc..3eafd06 100644 --- a/recipes-apps/tasks/task-sysmocom-tools.bb +++ b/recipes-apps/tasks/task-sysmocom-tools.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = " \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" ALLOW_EMPTY_${PN} = "1" -PR = "r13" +PR = "r14" RDEPENDS_${PN} = "\ lmsensors-scripts \ @@ -20,6 +20,5 @@ RDEPENDS_${PN} = "\ sysmocom-backup-default \ sysmocom-systemd \ sysmocom-configure \ - sysmocom-openvpn-config \ osmo-config-merge \ "